Kill the worms before flies restart lifecycle :-)

It's no longer used

git-svn-id: https://svn.apache.org/repos/asf/directory/project/branches/bigbang@640938 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/site/pom.xml b/site/pom.xml
deleted file mode 100644
index 652546d..0000000
--- a/site/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.apache.directory</groupId>
-  <artifactId>directory-sitedocs</artifactId>
-  <version>1.0-RC1</version>
-  <name>Apache Directory Project</name>
-  <packaging>pom</packaging>
-   
-  <url>http://directory.apache.org/</url>
-  
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/DIR</url>
-  </issueManagement>
-  
-  <inceptionYear>2003</inceptionYear>
-  
-  <distributionManagement>
-    <site>
-      <id>apache.websites</id>
-      <url>scp://minotaur.apache.org/www/directory.apache.org/</url>
-    </site>
-  </distributionManagement>
-  
-  <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://minotaur.apache.org/maven-snapshot-repository</url>
-    </repository>
-  </repositories>
-  
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
-    </license>
-  </licenses>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory</connection>
-    <url>http://svn.apache.org/viewcvs.cgi/directory</url>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory</developerConnection>
-  </scm>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/site/site.readme.txt b/site/site.readme.txt
deleted file mode 100644
index 386fad9..0000000
--- a/site/site.readme.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-##############  W O R K  I N  P R O G R E S S  ############## 
-
-To generate the main site for Apache Directory Project 
-change to the "site" directory under root project and execute
-
-	mvn site
-
-The site will be generated at
-
-	target/site
-
-For deploying the site to the remote server you need to
-configure the Apache Web Server access parameters
-in your local m2 configuration file which is normally at
-
-	$HOME/.m2/settings.xml
-
-A typical settings file which contains only this
-configuration would generally look as follows (for UNIX):
-
-	<settings>
-	  <servers>
-	    <server>
-	      <id>apache.websites</id>
-	      <username>YourApacheUserName</username>
-	      <privateKey>$HOME/.ssh/id_rsa</privateKey>
-	      <directoryPermissions>775</directoryPermissions>
-	      <filePermissions>664</filePermissions>
-	    </server>
-	  </servers>
-	</settings>
-
-To deploy the site to remote server execute
-
-	mvn site-deploy
diff --git a/site/src/etc/site-alternate.jsl b/site/src/etc/site-alternate.jsl
deleted file mode 100644
index 6fa8272..0000000
--- a/site/src/etc/site-alternate.jsl
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- * ========================================================================
- * 
- * Copyright 2004 The 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.
- * 
- * ========================================================================
--->
-<!-- stylesheet to be used -->
-<jsl:stylesheet select="$doc"
-  xmlns:define="jelly:define"
-  xmlns:j="jelly:core"
-  xmlns:jsl="jelly:jsl"
-  xmlns:log="jelly:log"
-  xmlns:util="jelly:util"
-  xmlns:x="jelly:xml"
-  xmlns:doc="doc"
-  xmlns:maven="jelly:maven"
-  xmlns="dummy"
-  trim="true">
-  <jsl:template match="document" trim="true">
-    <j:useBean var="navbean" class="org.apache.maven.NavBean"/>
-	<j:set var="location" value="${outFile.substring(destdir.length())}"/>
-	<util:replace var="location" oldChar="\" newChar="/" value="${location}"/>
-    <!-- Stores location for publish date / version -->
-    <j:set var="date">${maven.xdoc.date}</j:set>
-	<j:setProperties object="${navbean}" document="${doc}" location="${location}"/>
-	
-    <x:doctype name="html" publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" systemId="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-    <html>
-      <head>
-        <j:set var="docTitle"><x:expr select="./properties/title"/></j:set>
-        <j:set var="docDescription">
-          <x:expr select="./properties/description"/>
-        </j:set>
-        <x:if select="$nav/title">
-          <title><x:expr select="$nav/title"/> - ${docTitle}</title>
-        </x:if>
-        <x:if select="not($nav/title)">
-          <title>${pom.name} - ${docTitle}</title>
-        </x:if>
-        
-        <j:set var="themeUrl" value="${maven.xdoc.theme.url}"/>
-        <util:file var="projectCssFile" name="${maven.docs.src}/style/project.css"/>
-        
-        <style type="text/css" media="all"><![CDATA[
-          @import url("${relativePath}/style/maven-base.css");
-          ]]>
-			    <j:if test="${!empty(themeUrl)}"><![CDATA[
-				    @import url("${maven.xdoc.theme.url}");
-			    ]]></j:if>
-			    <j:if test="${empty(themeUrl)}"><![CDATA[
-				    @import url("${relativePath}/style/maven-${maven.xdoc.theme}.css");
-			    ]]></j:if>
-			    <j:if test="${projectCssFile.exists()}"><![CDATA[
-				    @import url("${relativePath}/style/project.css");
-			    ]]></j:if>
-        </style>
-        
-        <link rel="stylesheet" type="text/css" href="${relativePath}/style/print.css" media="print"/>
-        <meta http-equiv="Content-Type" content="text/html; charset=${outputencoding}"/>
-        <x:forEach var="author" select="./properties/author">
-          <meta name="author" content="${author.text}"/>
-          <meta name="email" content="${author.attribute('email').value}"/>
-        </x:forEach>
-        <j:if test="${!empty(docDescription)}">
-          <meta name="description" content="${docDescription}"/>
-        </j:if>
-        <jsl:applyTemplates select="$doc/document/head/*"/>
-        
-      </head>
-
-      <x:element name="body"><j:whitespace trim="true">
-        <x:attribute name="class">composite</x:attribute>
-        <x:forEach var="attr" select="$doc/document/body/@*">
-          <x:attribute name="${attr.name}">${attr.value}</x:attribute>
-        </x:forEach>
-        </j:whitespace>
-
-        <div id="banner">
-              <!-- organization logo -->
-                <j:set var="logo" value="${pom.organization.logo}"/>
-                <j:if test="${!empty(logo)}">
-                  <!-- set url to org or project url -->
-                  <j:set var="url" value="${pom.organization.url}"/>
-                  <j:if test="${!empty(url)}">
-                    <j:set var="home" value="${pom.organization.url}"/>
-                  </j:if>
-                  <j:if test="${empty(url)}">
-                    <j:set var="home" value="${pom.url}"/>
-                  </j:if>
-                  <!-- set image to relative or complete -->
-                  <j:set var="image" value="${pom.organization.logo}"/>
-                  <j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
-                    <j:set var="image" value="${relativePath}${image}"/>
-                  </j:if>
-                  <a href="${home}" id="organizationLogo">
-                    <img src="${image}" alt="${pom.organization.name}" />
-                  </a>
-                </j:if>
-
-              <!-- project logo and link -->
-                  <j:set var="logo" value="${pom.logo}"/>
-                  <j:if test="${logo != null and logo != ''}">
-                    <!-- set image to relative or complete -->
-                    <j:set var="image" value="${pom.logo}"/>
-                    <j:if test="${!image.startsWith('http://') and !image.startsWith('https://')}">
-                      <j:set var="image" value="${relativePath}${image}"/>
-                    </j:if>
-
-                    <a href="${pom.url}" id="projectLogo">
-                      <img src="${image}" alt="${pom.name}"/>
-                    </a>
-                  </j:if>
-                  <j:if test="${logo == null or logo == ''}">
-                      <a href="${pom.url}" id="projectLogo">
-                        <span>${pom.name}</span>
-                      </a>
-                  </j:if>
-                <div class="clear"><hr /></div>
-        </div>
-
-        <div id="breadcrumbs">
-              <j:if test="${date == 'left'}">
-                <maven:property var="version" name="maven.xdoc.version" defaultValue="${pom.currentVersion}"/>
-                <div class="xleft">
-                	Last published: ${build.date}
-                  <j:if test="${!empty(version)}">| Doc for ${version}</j:if>
-                </div>
-              </j:if>
-                <div class="xright">
-                  <j:if test="${date == 'right'}">
-                    Last published: ${build.date}
-                    <x:if select="$nav/body/links">|</x:if>
-                  </j:if>
-                  <!-- render links -->
-                  <x:if select="$nav/body/links">
-                    <jsl:applyTemplates select="$nav/body/links"/>
-                  </x:if>
-                </div>
-                <div class="clear"><hr /></div>
-        </div>
-        
-        <!-- left column start -->
-        <div id="leftColumn">
-          <div id="navcolumn">
-            <j:if test="${date == 'navigation-top'}">
-              <div id="lastPublished">Last published: ${build.date}</div>
-            </j:if>
-            <x:if select="$nav">
-              <jsl:applyTemplates select="$nav/body/menu[not(@type) | @type='header'] | $nav/body/search"/>
-            </x:if>
-            <jsl:applyTemplates select="$projectNav/body/menu"/>
-            <!-- allows user to put menu items after standard reports -->
-            <x:if select="$nav">
-              <jsl:applyTemplates select="$nav/body/menu[@type='footer']"/>
-            </x:if>
-            <!-- Standard Maven Navigation -->
-            <j:set var="fileName">${file}</j:set>
-            <j:set var="poweredbyimage">${maven.xdoc.poweredby.image}</j:set>
-            <j:set var="poweredbytitle">${maven.xdoc.poweredby.title}</j:set>
-            <j:set var="poweredbyurl" value="${maven.xdoc.poweredby.url}" />
-            <j:if test="${!empty(poweredbyimage)}">
-              <a id="poweredBy" href="${poweredbyurl}" title="${poweredbytitle}">
-                <img alt="${maven.xdoc.poweredby.title}" src="${relativePath}/images/logos/${poweredbyimage}" />
-              </a>
-            </j:if>
-            <j:if test="${date == 'navigation-bottom'}">
-              <div id="lastPublished">Last published: ${build.date}</div>
-            </j:if>
-          </div>
-       </div>
-       <!-- left column end -->
-              
-       <!-- body start -->
-       <div id="bodyColumn">
-         <div class="contentBox">
-           <!-- FIXME really shouldn't use $doc, but jelly loses it's context again -->
-           <jsl:applyTemplates select="$doc/document/body/section"/>
-           <jsl:applyTemplates select="$doc/document/body/release" />
-           <jsl:applyTemplates select="$doc/document/body/goals" />
-         </div>
-       </div>
-       <div class="clear"><hr /></div>
-       <!-- body end -->
-        
-              
-       <!-- footer start -->    
-       <div id="footer">  
-          <jsl:applyTemplates select="$nav/body/footer"/>
-          <div class="xright">
-            <j:if test="${!empty(pom.organization.name)}">
-              <j:if test="${!empty(pom.inceptionYear)}">
-                <j:if test="${pom.inceptionYear == mavenCurrentYear}">
-                  &#169; ${mavenCurrentYear}, ${pom.organization.name}
-                </j:if>
-                <j:if test="${pom.inceptionYear != mavenCurrentYear}">
-                  &#169; ${pom.inceptionYear}-${mavenCurrentYear}, ${pom.organization.name}
-                </j:if>
-              </j:if>
-              <j:if test="${empty(pom.inceptionYear)}">
-                &#169; ${mavenCurrentYear}, ${pom.organization.name}
-              </j:if>
-            </j:if>
-            <j:if test="${date == 'bottom'}">
-              - Last published: ${build.date}
-            </j:if>
-          </div>
-          <div class="clear"><hr /></div>
-        </div>
-        <!-- footer end --> 
-              
-        
-      </x:element>
-    </html>
-  </jsl:template>
-
-  <!-- process the properties of the doc -->
-  <jsl:template match="properties" trim="true">
-    <!-- stick head block here later -->
-  </jsl:template>
-
-  <!-- Process a menu for the navigation bar -->
-  <jsl:template match="menu" trim="true">
-    <j:set var="_menuName"><x:expr select="@name"/></j:set>
-    <j:set var="_menuName"><doc:escapeNameToken value="${_menuName}"/></j:set>
-    <j:choose>
-      <j:when test="${!empty(_menuName)}">
-        <div id="menu${_menuName}">
-          <h5><x:expr select="@name"/></h5>
-          <ul><jsl:applyTemplates select="item"/></ul>
-        </div>
-      </j:when>
-      <j:otherwise>
-        <div>
-          <ul><jsl:applyTemplates select="item"/></ul>
-        </div>
-      </j:otherwise>
-    </j:choose>
-    
-  </jsl:template>
-
-  <jsl:template match="item" trim="true">
-    <x:set var="item" select="."/>
-    <x:set var="_name" select="string(@name)"/>
-    <x:set var="_link" select="string(@href)"/>
-    <x:set var="_img" select="string(@img)"/>
-    <x:set var="_target" select="string(@target)"/>
-    <x:set var="_childCount" select="count(./item)"/>
-    <j:set var="_isCollapsed" value="${navbean.isCollapsed(item.get(0))}"/>
-    <j:set var="_state" value="none"/>
-    <j:if test="${_childCount.intValue() gt 0}">
-      <j:if test="${!_isCollapsed}"><j:set var="_state" value="expanded"/></j:if>
-      <j:if test="${_isCollapsed}"><j:set var="_state" value="collapsed"/></j:if>
-    </j:if>
-    <li class="${_state}">
-      <j:if test="${navbean.isSelected(item.get(0))}">
-        <strong><doc:itemLink name="${_name}" link="${_link}" img="${_img}" state="${_state}" target="${_target}"/></strong>
-      </j:if>
-      <j:if test="${!navbean.isSelected(item.get(0))}">
-        <doc:itemLink name="${_name}" link="${_link}" img="${_img}" state="${_state}" target="${_target}"/>
-      </j:if>
-      <j:if test="${_state == 'expanded'}">
-        <ul>
-          <jsl:applyTemplates select="item"/>
-        </ul>
-      </j:if>
-    </li>
-  </jsl:template>
-
-  <!-- Process the breadcrumb navbar -->
-  <jsl:template match="links" trim="true">
-    <j:set var="linkCount" value="1"/>
-    <x:forEach var="link" select="item">
-      <j:set var="_img"><x:expr select="@img"/></j:set>
-      <j:set var="_name"><x:expr select="@name"/></j:set>
-      <j:set var="_link"><x:expr select="@href"/></j:set>
-      <j:set var="_target"><x:expr select="@target"/></j:set>
-      <j:whitespace trim="false">
-        <j:if test="${linkCount != 1}">
-          <j:if test="${!(maven.xdoc.crumb.separator == '')}">
-            <span class="separator">${maven.xdoc.crumb.separator}</span>
-          </j:if>
-        </j:if>
-        <doc:itemLink name="${_name}" link="${_link}" img="${_img}" target="${_target}"/>
-      </j:whitespace>
-      <j:set var="linkCount" value="${1+linkCount}"/>
-    </x:forEach>
-  </jsl:template>
-
-  <!-- Google site search -->
-  <jsl:template match="search" trim="true">
-    <!-- Search code: http://www.google.com/searchcode.html -->
-    <!-- Google logos: http://www.google.com/stickers.html -->
-    <!-- Terms: http://www.google.com./services/terms_free.html -->
-    <div id="search">
-      <h5>Search ${pom.name}</h5>
-      <form method="get" action="http://www.google.com/search">
-        <a class="navlink" href="http://www.google.com">
-          <img src="http://www.google.com/logos/Logo_25wht.gif" width="75" height="32" alt="Google" />
-        </a>
-        <j:set var="siteURL" value="${pom.url}"/>
-        <!-- google fails on urls that end with / -->
-        <j:if test="${siteURL.endsWith('/')}">
-          <j:set var="URLLength" value="${siteURL.length() - 1}"/>
-          <j:set var="siteURL" value="${siteURL.substring(0, URLLength.intValue())}"/>
-        </j:if>
-        <input type="text" id="q" size="15" name="q" maxlength="255" value=""/>
-        <input type="submit" id="btnG" value="Go" name="btnG"/>
-        <input type="hidden" name="domains" value="${siteURL}"/>
-        <input type="hidden" id="search" name="sitesearch" value="${siteURL}"/>
-      </form>
-    </div>
-  </jsl:template>
-
-  <!-- process a documentation section -->
-  <jsl:template match="section" trim="true">
-    <div class="section">
-      <j:set var="_sectionName"><x:expr select="@name"/></j:set>
-      <!-- named anchors can't contain whitespaces -->
-      <j:set var="_anchorName"><doc:escapeNameToken value="${_sectionName}"/></j:set>
-      <j:if test="${!empty(_sectionName)}">
-          <a name="${_anchorName}"/><h2>${_sectionName}</h2>
-      </j:if>
-      <jsl:applyTemplates select="*"/>
-    </div>
-  </jsl:template>
-
-  <jsl:template match="subsection" trim="true">
-    <div class="subsection">
-      <j:set var="_sectionName"><x:expr select="@name"/></j:set>
-      <!-- named anchors can't contain whitespaces -->
-      <j:set var="_anchorName"><doc:escapeNameToken value="${_sectionName}"/></j:set>
-      <j:if test="${!empty(_sectionName)}">
-          <a name="${_anchorName}"/><h3>${_sectionName}</h3>
-      </j:if>
-      <jsl:applyTemplates select="*"/>
-    </div>
-  </jsl:template>
-
-  <jsl:template match="source" trim="false">
-    <div class="source"><pre><jsl:applyTemplates /></pre></div>
-  </jsl:template>
-  
-  <!-- preserve whitespace in the following elements -->
-  <jsl:template match="pre | script | style" trim="true">
-    <x:set var="nodename" select="name()"/>
-    <x:element name="${nodename}">
-      <x:forEach var="attr" select="@*">
-        <x:attribute name="${attr.name}">${attr.value}</x:attribute>
-      </x:forEach>
-      <j:whitespace trim="false"><jsl:applyTemplates /></j:whitespace>
-    </x:element>
-  </jsl:template>
-  
-  <!-- xhtml fixup: add missing alt attribute for images -->
-  <jsl:template match="img" trim="true">
-    <x:element name="img">
-      <x:forEach var="attr" select="@*">
-        <x:attribute name="${attr.name}">${attr.value}</x:attribute>
-      </x:forEach>
-      <x:set var="noalt" select="count(./@alt) = 0" />
-      <j:if test="${noalt}" >
-        <x:attribute name="alt"></x:attribute>
-      </j:if>
-    </x:element>
-  </jsl:template>
-
-  <jsl:template match="footer" trim="true">
-    <div class="xleft">
-      <jsl:applyTemplates select="*"/>
-    </div>
-  </jsl:template>
-
-  <jsl:template match="table" trim="true">
-    <j:set var="rowcount" value="0"/>
-    <table class="bodyTable">
-      <jsl:applyTemplates select="*"/>
-    </table>
-  </jsl:template>
-
-  <jsl:template match="tr" trim="true">
-    <j:choose>
-      <j:when test="${rowMode == 'a'}">
-        <j:set var="rowMode" value="b"/>
-      </j:when>
-      <j:otherwise>
-        <j:set var="rowMode" value="a"/>
-      </j:otherwise>
-    </j:choose>
-    <x:element name="tr"><j:whitespace trim="true">
-      <x:attribute name="class">${rowMode}</x:attribute>
-      <x:forEach var="attr" select="@*">
-        <x:attribute name="${attr.name}">${attr.value}</x:attribute>
-      </x:forEach>
-      <jsl:applyTemplates select="*"/>
-</j:whitespace></x:element>
-  </jsl:template>
-
-      <!--************************-->
-      <!-- goals documentation    -->
-      <!--************************-->
-      <jsl:template match="goals" trim="true">
-        <!-- reset row alternation -->
-        <j:set var="rowMode" value="" />
-        <div class="h3">
-          <a name="Goals"/><h3>Goals</h3>
-          <table class="bodyTable">
-            <thead>
-              <tr><th>Goal</th><th>Description</th></tr>
-            </thead>
-            <tbody>
-              <jsl:applyTemplates select="goal"/>
-            </tbody>
-          </table>
-        </div>
-      </jsl:template>
-      
-      <!-- a goal -->
-      <jsl:template match="goal" trim="true">
-        <j:choose>
-          <j:when test="${rowMode == 'a'}">
-            <j:set var="rowMode" value="b"/>
-          </j:when>
-          <j:otherwise>
-            <j:set var="rowMode" value="a"/>
-          </j:otherwise>
-        </j:choose>
-        
-        <x:element name="tr"><j:whitespace trim="true">
-          <x:attribute name="class">${rowMode}</x:attribute>
-          <j:set var="_goalName"><x:expr select="./name" /></j:set>
-          <td style="width:20%"><a name="${_goalName}"/>${_goalName}</td>
-          <td ><jsl:applyTemplates select="description" /></td>
-</j:whitespace></x:element>
-      </jsl:template>   
-      
-      <jsl:template match="description">
-        <jsl:applyTemplates trim="false"/>
-      </jsl:template>
-
-  <!-- remove the space at the end of parsed "a" anchors and fix local hrefs -->
-  <jsl:template match="a" trim="true">
-    <x:element name="a" trim="true">
-      <x:forEach var="attr" select="@*">
-        <j:choose>
-          <j:when test="${attr.name == 'href'}">
-            <j:set var="href" value="${attr.value}" />
-            <j:choose>                 
-              <j:when test="${href.startsWith('#')}">
-              	<x:attribute name="href">
-              	  <doc:escapeNameToken value="${href}"/>
-              	</x:attribute>
-              </j:when>
-              <j:when test="${href.startsWith('http://')}">
-                <x:attribute name="href">${href}</x:attribute>
-              	<x:attribute name="class">externalLink</x:attribute>
-              	<x:attribute name="title">External Link</x:attribute>
-              </j:when>                  
-              <j:otherwise>
-                <x:attribute name="href">${href}</x:attribute>
-              </j:otherwise>
-            </j:choose>
-          </j:when>
-          <j:when test="${attr.name == 'target'}">
-            <j:set var="target">${attr.value}</j:set>
-            <j:if test="${!empty(target) and target.equals('_blank')}">
-              <x:attribute name="class">newWindow</x:attribute>
-              <x:attribute name="title">New Window</x:attribute>
-            </j:if>              
-            <x:attribute name="target">${target}</x:attribute>
-          </j:when>
-          <j:when test="${attr.name == 'name'}">
-            <x:attribute name="name">
-              <doc:escapeNameToken value="${attr.value}"/>
-            </x:attribute>
-          </j:when>
-          <j:otherwise>
-            <x:attribute name="${attr.name}">${attr.value}</x:attribute>
-          </j:otherwise>
-        </j:choose>
-      </x:forEach>
-      <jsl:applyTemplates/>
-    </x:element>
-  </jsl:template>
-   
-  <!-- copy any other elements through -->
-  <jsl:template match="*" trim="false"><jsl:copy trim="false"><jsl:applyTemplates trim="false"/></jsl:copy></jsl:template>
-   
-  <!-- element values don't pass through as text -->
-  <jsl:template match="@*"/>
-
-  <!-- CDATA and text nodes pass-thru -->
-  <jsl:template match="text()"><x:expr select="."/></jsl:template>
-
-</jsl:stylesheet>
diff --git a/site/src/etc/site.jsl b/site/src/etc/site.jsl
deleted file mode 100644
index 69b9537..0000000
--- a/site/src/etc/site.jsl
+++ /dev/null
@@ -1,629 +0,0 @@
-<?xml version="1.0"?>
-<!-- stylesheet to be used -->
-<jsl:stylesheet select="$doc"
-  xmlns:define="jelly:define"
-  xmlns:j="jelly:core"
-  xmlns:jsl="jelly:jsl"
-  xmlns:log="jelly:log"
-  xmlns:util="jelly:util"
-  xmlns:x="jelly:xml"
-  xmlns:doc="doc"
-  xmlns="dummy" trim="false">
-  <jsl:template match="document" trim="false">
-    <j:useBean var="navbean" class="org.apache.maven.NavBean"/>
-	<j:set var="location" value="${outFile.substring(destdir.length())}"/>
-	<util:replace var="location" oldChar="\" newChar="/" value="${location}"/>
-
-    <!-- Stores location for publish date / version -->
-    <j:set var="date">${maven.xdoc.date}</j:set>
-      
-	<j:setProperties 
-		object="${navbean}"
-  		document="${doc}"
-  		location="${location}"/>
-	
-	<x:doctype name="html"
-      publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
-      systemId="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-    <html>
-      <head>
-        <j:set var="docTitle">
-          <x:expr select="./properties/title"/>
-        </j:set>
-        <x:if select="$nav/title">
-          <title>
-            <x:expr select="$nav/title"/> - ${docTitle}
-          </title>
-        </x:if>
-        <x:if select="not($nav/title)">
-          <title>${pom.name} - ${docTitle}</title>
-        </x:if>
-        
-        <style type="text/css"><![CDATA[
-          @import url("${relativePath}/style/tigris.css");
-          @import url("${relativePath}/style/maven.css");
-        ]]></style>
-        
-        <util:file var="projectCssFile" name="${maven.docs.src}/style/project.css"/>
-        <j:if test="${projectCssFile.exists()}">
-          <style type="text/css"><![CDATA[
-            @import url("${relativePath}/style/project.css");
-          ]]></style>
-        </j:if>
-        
-        <!-- FIXME: once someone works out how to stop this breaking
-        <x:element name="script"><x:attribute name="type">text/javascript</x:attribute>
-          if (document.layers) {
-                document.writeln(''+
-                '<link rel="stylesheet" type="text/css" href="${relativePath}/style/ns4_only.css" media="screen" /><link rel="stylesheet" type="text/css" href="${relativePath}/style/maven_ns4_only.css" media="screen"/>');
-              }
-            </x:element>
-        -->
-        <link rel="stylesheet" type="text/css" href="${relativePath}/style/print.css" media="print"/>
-        <meta http-equiv="Content-Type" content="text/html; charset=${outputencoding}"></meta>
-        <x:forEach var="author" select="./properties/author">
-          <meta name="author" content="${author.text}"/>
-          <meta name="email" content="${author.attribute('email').value}"/>
-        </x:forEach>
-        
-        <jsl:applyTemplates select="$doc/document/head/*"/>
-        
-      </head>
-
-      <x:element name="body"><j:whitespace trim="true">
-        <x:attribute name="class">composite</x:attribute>
-        <x:forEach var="attr" select="$doc/document/body/@*">
-          <x:attribute name="${attr.name}">${attr.value}</x:attribute>
-        </x:forEach>
-        </j:whitespace>
-
-        <div id="banner">
-          <table border="0" cellspacing="0" cellpadding="8" width="100%" height="103">
-            <tr>
-              <!-- organization logo -->
-              <td>
-                <j:set var="logo" value="${pom.organization.logo}"/>
-                <j:if test="${!empty(logo)}">
-                  <!-- set url to org or project url -->
-                  <j:set var="url" value="${pom.organization.url}"/>
-                  <j:if test="${!empty(url)}">
-                    <j:set var="home" value="${pom.organization.url}"/>
-                  </j:if>
-                  <j:if test="${empty(url)}">
-                    <j:set var="home" value="${pom.url}"/>
-                  </j:if>
-                  <!-- set image to relative or complete -->
-                  <j:set var="image" value="${pom.organization.logo}"/>
-                  <j:if test="${!image.startsWith('http://')}">
-                    <j:set var="image" value="${relativePath}${image}"/>
-                  </j:if>
-                  <a href="${home}">
-                    <img src="${image}" align="left" alt="${pom.organization.name}" border="0"/>
-                  </a>
-                </j:if>
-              </td>
-
-              <td></td>
-              <td>
-                <div align="right" id="login">
-                  <j:set var="logo" value="${pom.logo}"/>
-                  <j:if test="${logo != null and logo != ''}">
-                    <j:set var="image" value="${pom.logo}"/>
-                    <j:if test="${!image.startsWith('http://')}">
-                      <j:set var="image" value="${relativePath}${image}"/>
-                    </j:if>
-                    <a href="${pom.url}">
-                      <img src="${image}" align="right" alt="${pom.name}" border="0"/>
-                    </a>
-                  </j:if>
-                </div>
-              </td>
-
-            </tr>
-          </table>
-        </div>
-        <div id="breadcrumbs">
-          <table border="0" cellspacing="0" cellpadding="4" width="100%">
-            <tr>
-              <j:if test="${date == 'left'}">
-                <j:set var="version" value="${maven.xdoc.version}"/>
-                <td>Last published: ${build.date}
-                  <j:if test="${!empty(version)}">| Doc for ${version}</j:if>
-                </td>
-              </j:if>
-              <td>
-                <div align="right">
-                  <j:if test="${date == 'right'}">
-                    Last published: ${build.date}
-                    <x:if select="$nav/body/links">|</x:if>
-                  </j:if>
-                  <!-- render links -->
-                  <x:if select="$nav/body/links">
-                    <jsl:applyTemplates select="$nav/body/links"/>
-                  </x:if>
-                  <x:if select="not($nav/body/links)">
-                    <!-- FIXME &nbsp; -->
-                  </x:if>
-                </div>
-              </td>
-            </tr>
-          </table>
-        </div>
-        <!-- Body of the page -->
-        <table border="0" cellspacing="0" cellpadding="8" width="100%"> <!--id="main" -->
-          <tr valign="top">
-            <td id="leftcol" width="20%">
-              <div id="navcolumn">
-                <j:if test="${date == 'navigation-top'}">
-                  <div>
-                    <small>Last published: ${build.date}</small>
-                  </div>
-                </j:if>
-
-                <x:if select="$nav">
-                  <jsl:applyTemplates select="$nav/body/menu[not(@type) | @type='header'] | $nav/body/search"/>
-                </x:if>
-                
-                <!-- Standard Maven Navigation -->
-                <j:set var="fileName">${file}</j:set>
-
-                <!-- 
-                 ! Check to see if the user wishes to include the
-                 ! maven-generated docs on their site.
-                 !-->
-                <j:if test="${includeProjectDocumentation.equals('yes')}">
-                <div>
-                  <strong>Project Documentation</strong>
-                  <!--
-                  <div>
-                    <small>
-                      <a href="${relativePath}/index.html">About ${pom.name}</a>
-                    </small>
-                  </div>
-                  -->
-                  <div>
-                    <small>
-                      <a href="${relativePath}/project-info.html">Project Info</a>
-                    </small>
-                    <util:tokenize var="projectInfoFiles" delim=",">${maven.xdoc.projectInfo}</util:tokenize>
-                    <j:forEach var="infoFile" items="${projectInfoFiles}">
-                      <j:if test="${relativePath == '.' and fileName.endsWith(infoFile)}">
-                        <div>
-                          <small>
-                            <a href="${relativePath}/mail-lists.html">Mailing Lists</a>
-                          </small>
-                        </div>
-                        <div>
-                          <small>
-                            <a href="${relativePath}/team-list.html">Project Team</a>
-                          </small>
-                        </div>
-                        <div>
-                          <small>
-                            <a href="${relativePath}/dependencies.html">Dependencies</a>
-                          </small>
-                        </div>
-                        <j:if test="${!empty(pom.repository.url)}">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/cvs-usage.html">Source Repository</a>
-                            </small>
-                          </div>
-                        </j:if>
-                        <j:if test="${!empty(pom.issueTrackingUrl)}">
-                          <div>
-                            <small>
-                              <a href="${relativePath}/issue-tracking.html">Issue Tracking</a>
-                            </small>
-                          </div>
-                        </j:if>
-                      </j:if>
-                    </j:forEach>
-                  </div>
-                  <div>
-                    <small>
-                      <a href="${relativePath}/maven-reports.html">Project Reports</a>
-                    </small>
-                    
-					<!--
-                     | Check to see if we need to include the report
-                     | links in this document.  The only time we
-                     | need to do this is when the current document
-                     | either the maven-reports.xml doc (the page
-                     | is displayed when clicking on Project
-                     | Reports) or when the current document is one
-                     | of the actual reports (in which case we want
-                     | to leave the project report links expanded.
-                     |-->
-                    <j:set var="includeReportLinks" value="false"/>
-                    <j:forEach var="report" items="${reports}">
-                      <j:set var="linkWithXmlExt" value="${report.link}.xml"/>
-                      <j:if test="${relativePath == '.' and (fileName.endsWith('maven-reports.xml') or fileName.endsWith(linkWithXmlExt))}">
-                      <j:set var="includeReportLinks" value="true"/>
-                      </j:if>
-                    </j:forEach>
-                    
-                    <!--
-                     | If we need to include the report links, then
-                     | do so.  This is determined by the above
-                     | block.
-                     |-->
-                    <j:if test="${includeReportLinks == 'true'}">
-                      <j:forEach var="report" items="${reports}">
-                        <div>
-                          <small>
-                            <a href="${relativePath}/${report.link}.html">
-                              ${report.name}
-                            </a>
-                          </small>
-                        </div>
-                      </j:forEach>
-                    </j:if>
-                  </div>
-                  <j:if test="${pom.reports.isEmpty()}">
-                    <j:if test="${sourcesPresent}">
-                      <div>
-                        <small>
-                          <a href="${relativePath}/apidocs/index.html">JavaDocs</a>
-                        </small>
-                      </div>
-                      <div>
-                        <small>
-                          <a href="${relativePath}/xref/index.html">Source XReference</a>
-                        </small>
-                      </div>
-                      <j:if test="${unitTestSourcesPresent == 'true'}">
-                        <div>
-                          <small>
-                            <a href="${relativePath}/xref-test/index.html">Test XReference</a>
-                          </small>
-                        </div>
-                      </j:if>
-                    </j:if>
-                  </j:if>
-                  <!--
-                  <j:set var="devProcess" value="false"/>
-                  <util:available file="${maven.docs.src}/development-process.xml">
-                    <j:set var="devProcess" value="true"/>
-                  </util:available>
-                  <j:if test="${devProcess}">
-                    <div>
-                      <small>
-                        <a href="${relativePath}/development-process.html">Development Process</a>
-                      </small>
-                    </div>
-                  </j:if>
-                  <j:if test="${!devProcess}">
-                    <div>
-                      <small>
-                        <j:set var="devProcess">${maven.xdoc.developmentProcessUrl}</j:set>
-                        <a href="${devProcess}">Development Process</a>
-                      </small>
-                    </div>
-                  </j:if>
-                  -->
-                </div>
-              </j:if>
-              
-                <j:set var="poweredbyimage">${maven.xdoc.poweredby.image}</j:set>
-                <j:set var="poweredbytitle">${maven.xdoc.poweredby.title}</j:set>
-                <j:set var="poweredbyurl">${maven.xdoc.poweredby.url}</j:set>
-                <j:if test="${!empty(poweredbyimage)}">
-                	<div style="margin-top: 20px; width: 100%; text-align: center;">
-                		<a href="${poweredbyurl}" title="${poweredbytitle}"><img alt="${maven.xdoc.poweredby.title}" style="border: 1px solid black" src="${relativePath}/images/logos/${poweredbyimage}"/></a>
-                	</div>
-                </j:if>
-              
-                <j:if test="${date == 'navigation-bottom'}">
-                  <div>
-                    <small>Last published: ${build.date}</small>
-                  </div>
-                </j:if>
-              </div>
-            </td>
-            <td rowspan="2">
-              <div id="bodycol">
-                <!-- Insert MAIN body here -->
-                <div class="app">
-                  <!-- FIXME really shouldn't use $doc, but jelly loses it's context again -->
-                  <jsl:applyTemplates select="$doc/document/body/section"/>
-                  <jsl:applyTemplates select="$doc/document/body/glossary" />
-                  <jsl:applyTemplates select="$doc/document/body/release" />
-                  <jsl:applyTemplates select="$doc/document/body/changelog" />
-                  <jsl:applyTemplates select="$doc/document/body/taskList" />
-                  <jsl:applyTemplates select="$doc/document/body/goals" />
-                </div>
-              </div>
-            </td>
-          </tr>
-        </table>
-        <div id="footer">
-          <table style='width:100%' border="0" cellspacing="0" cellpadding="4">
-            <jsl:applyTemplates select="$nav/body/footer"/>
-            <tr>
-              <td>
-                <j:if test="${!empty(pom.organization.name)}">
-                  <j:if test="${!empty(pom.inceptionYear)}">
-                    <j:if test="${pom.inceptionYear == mavenCurrentYear}">
-                      &#169; ${mavenCurrentYear}, ${pom.organization.name}
-                    </j:if>
-                    <j:if test="${pom.inceptionYear != mavenCurrentYear}">
-                      &#169; ${pom.inceptionYear}-${mavenCurrentYear}, ${pom.organization.name}
-                    </j:if>
-                  </j:if>
-                  <j:if test="${empty(pom.inceptionYear)}">
-                    &#169; ${mavenCurrentYear}, ${pom.organization.name}
-                  </j:if>
-                </j:if>
-
-                <j:if test="${date == 'bottom'}">
-                  - Last published: ${build.date}
-                </j:if>
-              </td>
-              <j:if test="${date == 'bottom-right'}">
-                <td style='width: auto; text-align:right'>Last published: ${build.date}</td>
-              </j:if>
-            </tr>
-          </table>
-        </div>
-      </x:element>
-    </html>
-  </jsl:template>
-
-  <!-- process the properties of the doc -->
-  <jsl:template match="properties" trim="false">
-    <!-- stick head block here later -->
-  </jsl:template>
-
-  <!-- Process a menu for the navigation bar -->
-  <jsl:template match="menu" trim="false">
-    <div>
-      <strong><x:expr select="@name"/></strong>
-      <jsl:applyTemplates select="item"/>
-    </div>
-  </jsl:template>
-
-  <jsl:template match="item" trim="false">
-    <x:set var="item" select="."/>
-    <x:set var="_name" select="string(@name)"/>
-    <x:set var="_link" select="string(@href)"/>
-    <x:set var="_img" select="string(@img)"/>
-
-    <div>
-      <small>
-      	<j:if test="${navbean.isSelected(item.get(0))}">
-      		<b><doc:itemLink name="${_name}" link="${_link}" img="${_img}"/></b>
-      	</j:if>
-      	<j:if test="${!navbean.isSelected(item.get(0))}">
-      		<doc:itemLink name="${_name}" link="${_link}" img="${_img}"/>
-      	</j:if>
-      </small>
-	  <j:if test="${!navbean.isCollapsed(item.get(0))}">
-        <jsl:applyTemplates select="item"/>
-      </j:if>
-    </div>
-  </jsl:template>
-
-  <!-- Process the breadcrumb navbar -->
-  <jsl:template match="links" trim="false">
-    <j:set var="linkCount" value="1"/>
-    <x:forEach var="link" select="item">
-      <j:if test="${linkCount != 1}">|</j:if>
-      <j:set var="_name"><x:expr select="@name"/></j:set>
-      <j:set var="_link"><x:expr select="@href"/></j:set>
-      <doc:itemLink name="${_name}" link="${_link}"/>
-      <j:set var="linkCount" value="${1+linkCount}"/>
-    </x:forEach>
-  </jsl:template>
-
-  <!-- Google site search -->
-  <jsl:template match="search" trim="false">
-    <!-- Search code: http://www.google.com/searchcode.html -->
-    <!-- Google logos: http://www.google.com/stickers.html -->
-    <!-- Terms: http://www.google.com./services/terms_free.html -->
-    <div>
-      <strong>Search ${pom.name}</strong>
-      <form method="get" action="http://www.google.com/search">
-        <a class="navlink" href="http://www.google.com">
-          <img src="http://www.google.com/logos/Logo_25wht.gif" 
-               alt="Google" border="0" />
-        </a><p/>
-        <j:set var="siteURL" value="${pom.url}"/>
-        <!-- google fails on urls that end with / -->
-        <j:if test="${siteURL.endsWith('/')}">
-          <j:set var="URLLength" value="${siteURL.length() - 1}"/>
-          <j:set var="siteURL" value="${siteURL.substring(0, URLLength.intValue())}"/>
-        </j:if>
-        <input type="text" size="15" name="q" maxlength="255" value=""/>
-        <input type="submit" value="Go" name="btnG"/>
-        <input type="hidden" name="domains" value="${siteURL}"/>
-        <input type="hidden" id="search" name="sitesearch" value="${siteURL}"/>
-      </form>
-    </div>
-  </jsl:template>
-
-  <!-- process a documentation section -->
-  <jsl:template match="section" trim="false">
-    <div class="h3">
-      <j:set var="_sectionName"><x:expr select="@name"/></j:set>
-      <j:if test="${!empty(_sectionName)}">
-        <h3>
-          <a name="${_sectionName}">${_sectionName}</a>
-        </h3>
-      </j:if>
-      <jsl:applyTemplates select="*"/>
-    </div>
-  </jsl:template>
-
-  <jsl:template match="subsection" trim="false">
-    <div class="h4">
-      <j:set var="_sectionName"><x:expr select="@name"/></j:set>
-      <j:if test="${!empty(_sectionName)}">
-        <h4>
-          <a name="${_sectionName}">${_sectionName}</a>
-        </h4>
-      </j:if>
-      <jsl:applyTemplates select="*"/>
-    </div>
-  </jsl:template>
-
-  <jsl:template match="source" trim="false">
-    <div id="source">
-      <pre><x:expr select="."/></pre>
-    </div>
-  </jsl:template>
-
-  <jsl:template match="footer" trim="false">
-    <tr>
-      <td>
-        <jsl:applyTemplates select="*"/>
-      </td>
-    </tr>
-  </jsl:template>
-
-  <jsl:template match="table" trim="false">
-    <j:set var="rowcount" value="0"/>
-    <table cellpadding="3" cellspacing="2" border="1" width="100%">
-      <jsl:applyTemplates select="*"/>
-    </table>
-  </jsl:template>
-
-  <jsl:template match="tr" trim="false">
-    <j:choose>
-      <j:when test="${rowMode == 'a'}">
-        <j:set var="rowMode" value="b"/>
-      </j:when>
-      <j:otherwise>
-        <j:set var="rowMode" value="a"/>
-      </j:otherwise>
-    </j:choose>
-
-    <!-- copy attributes FIXME: Shouldn't this only be colspan|rowspan? -->
-    <x:element name="tr"><j:whitespace trim="true">
-      <x:attribute name="class">${rowMode}</x:attribute>
-      <x:forEach var="attr" select="@*">
-        <x:attribute name="${attr.name}">${attr.value}</x:attribute>
-      </x:forEach>
-      <jsl:applyTemplates select="*"/>
-</j:whitespace></x:element>
-  </jsl:template>
-
-  <!--************************-->
-  <!-- glossary documentation -->
-  <!--************************-->
-  <jsl:template match="glossary" trim="false">
-    <jsl:applyTemplates select="glossary-entries/glossary-entry" />
-  </jsl:template>
-      
-  <jsl:template match="glossary-entry" trim="false">
-    <strong><x:expr select="name" /></strong>
-    <br/>
-    <x:expr select="definition" />
-    <p/>
-  </jsl:template>
-
-      <!--************************-->
-      <!-- goals documentation    -->
-      <!--************************-->
-      <jsl:template match="goals" trim="false">
-        <!-- reset row alternation -->
-        <j:set var="rowMode" value="" />
-        <div class="h3">
-          <h3><a name="Goals">Goals</a></h3>
-          <table>
-            <tr width='100%'><th>Goal</th><th>Description</th></tr>
-            <jsl:applyTemplates select="goal"/>
-          </table>
-        </div>
-      </jsl:template>
-      
-      <!-- a goal -->
-        <!-- FIXME: this is copied from tr - there must be a way of
-             calling templates in jsl? -->
-      <jsl:template match="goal" trim="false">
-        <j:choose>
-          <j:when test="${rowMode == 'a'}">
-            <j:set var="rowMode" value="b"/>
-          </j:when>
-          <j:otherwise>
-            <j:set var="rowMode" value="a"/>
-          </j:otherwise>
-        </j:choose>
-        
-        <x:element name="tr"><j:whitespace trim="true">
-          <x:attribute name="class">${rowMode}</x:attribute>
-          <j:set var="_goalName"><x:expr select="./name" /></j:set>
-          <td width='20%'><a name="${_goalName}">${_goalName}</a></td>
-          <td width='80%'><jsl:applyTemplates select="description" /></td>
-</j:whitespace></x:element>
-      </jsl:template>   
-      
-      <jsl:template match="description">
-        <jsl:copy trim="false">
-          <jsl:applyTemplates trim="false"/>
-        </jsl:copy>
-      </jsl:template>
-
-      <!--************************-->
-      <!-- changelog documentation-->
-      <!--************************-->
-      <jsl:template match="changelog" trim="false">
-        <j:set var="rowMode" value="" />
-        <table width="100%">
-          <tr>
-            <th>Date</th><th>Author</th><th>Files/Message</th>
-          </tr>
-          <jsl:applyTemplates select="changelog-entry" />
-        </table>
-      </jsl:template>
-
-      <!-- transform a changelog entry -->
-      <!-- FIXME: tr code copied from above -->
-      <jsl:template match="changelog-entry" trim="false">
-        <j:choose>
-          <j:when test="${rowMode == 'a'}">
-            <j:set var="rowMode" value="b"/>
-          </j:when>
-          <j:otherwise>
-            <j:set var="rowMode" value="a"/>
-          </j:otherwise>
-        </j:choose>
-        
-        <x:element name="tr"><j:whitespace trim="true">
-          <x:attribute name="class">${rowMode}</x:attribute>
-          
-          <td><x:expr select="date" /> <x:expr select="time" /></td>
-          <td><x:expr select="author"/></td>
-          <td><jsl:applyTemplates select="*" />
-            <pre><x:expr select="msg"/></pre>
-          </td>
-</j:whitespace></x:element>
-      </jsl:template>
-
-      <jsl:template match="file">
-        <j:set var="url">${pom.repository.url}<x:expr select="name"/></j:set>
-        <j:set var="revUrl">${url}?<x:expr select="revision"/>&amp;content-type=text/vnd.viewcvs-markup</j:set>
-        <a href="${url}"><x:expr select="name"/></a> - 
-        <a href="${revUrl}">v<x:expr select="revision"/></a>
-        <br/>
-      </jsl:template>
-
-  <!-- remove the space at the end of parsed "a" anchors -->
-  <jsl:template match="a" trim="false">
-    <jsl:copy trim="true">
-      <jsl:applyTemplates trim="true"/>
-    </jsl:copy>
-  </jsl:template>
-
-  <!-- copy any other elements through -->
-  <jsl:template match="*" trim="false">
-    <jsl:copy trim="false">
-      <jsl:applyTemplates trim="false"/>
-    </jsl:copy>
-   </jsl:template>
-
-   <!-- element values don't pass through as text -->
-   <jsl:template match="@*"/>
-
-</jsl:stylesheet>
diff --git a/site/src/html/download.cgi b/site/src/html/download.cgi
deleted file mode 100644
index 06a42f2..0000000
--- a/site/src/html/download.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Wrapper script around mirrors.cgi script
-# (we must change to that directory in order for python to pick up the
-#  python includes correctly)
-cd /www/www.apache.org/dyn/mirrors
-/www/www.apache.org/dyn/mirrors/mirrors.cgi $*
diff --git a/site/src/html/download.html b/site/src/html/download.html
deleted file mode 100644
index 623686c..0000000
--- a/site/src/html/download.html
+++ /dev/null
@@ -1,277 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-    <html>
-      <head>
-          <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="Alex Karasulu"></meta>
-          <meta name="email" value="akarasulu@apache.org"></meta>
-      </head>
-
-      <body marginwidth="0" class="composite" marginheight="0">
-        <div id="banner">
-          <table height="103" border="0" width="100%" cellpadding="8" cellspacing="0">
-            <tr>
-              <td>
-                  <a href="http://incubator.apache.org/directory">
-                    <img border="0" alt="The Apache Directory Project" 
-                      src="./images/apache-Directory-logo.png" align="left"></img>
-                  </a>
-              </td>
-              <td>
-                <div id="login" align="right">
-                  <a href="http://apachecon.com/2003/US/index.html">
-                    <img border="0" src="http://www.apache.org/~ceki/ac2003/ac2003-150.gif"></img>
-                  </a>
-                </div>
-              </td>
-            </tr>
-          </table>
-        </div>
-        <div id="breadcrumbs">
-          <table border="0" width="100%" cellpadding="4" cellspacing="0">
-            <tr>
-              <td>
-                <div align="right">
-      <a href="http://apache.org/"> Apache </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>
-                </div>
-              </td>
-            </tr>
-          </table>
-        </div>
-
-        <table border="0" width="100%" cellpadding="8" cellspacing="0">
-          <tr valign="top">
-            <td width="200" id="leftcol">
-              <div id="navcolumn">
-    <div>
-      <strong>About Directory</strong>
-    <div>
-      <small><a href="index.html">Overview</a></small>
-    </div>
-    <div>
-      <small><a href="news.html">Latest News</a></small>
-    </div>
-    <div>
-      <small><a href="community/index.html">Community</a></small>
-    </div>
-    <div>
-      <small><a href="product/index.html">Products</a></small>
-    </div>
-    <div>
-      <small><a href="doc/index.html">Documentation</a></small>
-    </div>
-    </div>
-    <div>
-      <strong>Resources</strong>
-    <div>
-      <small><a href="license.html">License</a></small>
-    </div>
-    <div>
-      <small><a href="download.cgi">Downloads</a></small>
-    </div>
-    <div>
-      <small><a href="cvs.html">CVS</a></small>
-    </div>
-    <div>
-      <small><a href="http://wiki.apache.org/Directory">WIKI</a></small>
-    </div>
-    <div>
-      <small><a href="sandbox/index.html">Sandbox</a></small>
-    </div>
-    <div>
-      <small><a href="mailing-lists.html">Mailing Lists</a></small>
-    </div>
-    <div>
-      <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>
-    </div>
-    </div>
-              </div>
-            </td>
-            <td>
-              <div id="bodycol">
-                <div class="app">
-    <div class="h3">
-        <h3>
-          <a name="download">Directory Download Site</a>
-        </h3>
-
-    <div>
-     <!-- START DOWNLOAD PAGE CONTENT -->
-
-      <p>Use the links below to download a binary distribution of
-      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>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/Directory/">master
-      distribution directory</a> or, preferably, its
-      <a href="[preferred]/Directory/">mirror</a>.</p>
-
-<a name="Mirror"></a><h4>Mirror</h4>
-      <p>You are currently using the <strong>[preferred]</strong>.
-      If you encounter a problem with this mirror, please select another
-      mirror.  If all mirrors are failing, there are <em>backup</em>
-      mirrors (at the end of the mirrors list) that should be available.</p>
-
-      <form action="[location]" method="get" id="SelectMirror">
-<p>Other mirrors: <select name="Preferred"></p>
-[if-any http]
-  [for http]<option value="[http]">[http]</option>[end]
-[end]
-[if-any ftp]
-  [for ftp]<option value="[ftp]">[ftp]</option>[end]
-[end]
-[if-any backup]
-  [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-[end]
-        </select>
-        <input type="submit" value="Change">
-      </form>
-
-<a name="Projects"></a><h4>License</h4>
-
-<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>
-
-<a name="Projects"></a><h4>Projects</h4>
-
-<p>Here's a list of the most commonly requested distributions. You can
-<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
-at the moment.</p>
-
-<!-- lets maintain alphabetical order, peeps! -->
-<table border="1" width="100%" cellspacing="2" cellpadding="3">
-    <tr class="a">
-      <th>Product</th>
-      <th>Binary</th>
-      <th>Source</th>
-      <th>Jars</th>
-    </tr>
-    <tr class="a">
-<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/">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/">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/">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/">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>
-
-<a name="Verify Releases"></a><h4>Verify Releases</h4>
-
-<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/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/Directory/">main distribution
-directory</a>, rather than from a mirror. Then verify the signatures
-using</p>
-<p><code>
-% pgpk -a KEYS<br />
-% pgpv name-of-distributed-file.tar.gz.asc<br />
-</code>
-<em>or</em><br />
-<code>
-% pgp -ka KEYS<br />
-% pgp name-of-distributed-file.tar.gz.asc<br />
-</code>
-<em>or</em><br />
-<code>
-% gpg --import KEYS<br />
-% gpg --verify name-of-distributed-file.tar.gz.asc
-</code></p>
-
-<!--
-
-Using an automated process to retrieve files from mirrors is
-considered unsafe by the infrastructure team, as it is very
-easy to become a 'malicious mirror' and that could have grave
-consequences to users.
-
-Maven needs a way to verify distributions against md5 and/or asc
-files retrieved from the main distribution location before we
-re-enable this.
-
-<a name="Maven Repository"></a><h4>Maven Repository</h4>
-
-<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]/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 Directory binaries.</p>
-     <!-- END DOWNLOAD PAGE CONTENT -->
-    </div>
-
-    </div>
-                </div>
-              </div>
-            </td>
-          </tr>
-        </table>
-        <div id="footer">
-          <table border="0" cellpadding="4" cellspacing="0">
-            <tr>
-              <td>
-                       1997-2003, The Apache Directory Project
-              </td>
-            </tr>
-          </table>
-        </div>
-      </body>
-    </html>
diff --git a/site/src/site/oldimages/apache-avalon-logo.png b/site/src/site/oldimages/apache-avalon-logo.png
deleted file mode 100644
index 8b3e917..0000000
--- a/site/src/site/oldimages/apache-avalon-logo.png
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/avalon-logo.svg b/site/src/site/oldimages/avalon-logo.svg
deleted file mode 100644
index 0b97cd3..0000000
--- a/site/src/site/oldimages/avalon-logo.svg
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- ========================================================================= -->
-<!-- Copyright (C) The Apache Software Foundation. All rights reserved.        -->
-<!--                                                                           -->
-<!-- This software is published under the terms of the Apache Software License -->
-<!-- version 1.1, a copy of which has been included with this distribution in  -->
-<!-- the LICENSE file.                                                         -->
-<!-- ========================================================================= -->
-
-<!-- ========================================================================= -->
-<!-- Test description here                                                     -->
-<!--                                                                           -->
-<!-- @version $Id: avalon-logo.svg,v 1.1.1.1 2003/11/02 11:10:48 leosimons Exp $ -->
-<!-- ========================================================================= -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
-	<!ENTITY st0 "fill-rule:nonzero;fill:#D9D9D9;stroke:#D9D9D9;stroke-width:0.5956;stroke-miterlimit:4;">
-	<!ENTITY st1 "fill:url(#AIgd2);">
-	<!ENTITY st2 "fill:url(#AIgd3);">
-	<!ENTITY st3 "fill:url(#AIgd4);">
-	<!ENTITY st4 "fill:url(#AIgd6);">
-	<!ENTITY st5 "fill:url(#AIgd8);">
-	<!ENTITY st6 "fill-rule:nonzero;fill:#D9D9D9;stroke:#D9D9D9;stroke-width:0.254;stroke-miterlimit:4;">
-	<!ENTITY st7 "fill:url(#AIgd1);stroke:#000000;">
-	<!ENTITY st8 "fill:url(#AIgd10);">
-	<!ENTITY st9 "fill:url(#AIgd11);">
-	<!ENTITY st10 "fill:url(#AIgd16);">
-	<!ENTITY st11 "fill:url(#AIgd18);">
-	<!ENTITY st12 "fill:url(#AIgd19);">
-	<!ENTITY st13 "fill:url(#AIgd31);">
-	<!ENTITY st14 "fill:url(#AIgd35);">
-	<!ENTITY st15 "fill:url(#AIgd36);">
-	<!ENTITY st16 "fill:url(#AIgd38);">
-	<!ENTITY st17 "fill:url(#AIgd41);">
-	<!ENTITY st18 "fill:url(#AIgd42);">
-	<!ENTITY st19 "fill:url(#AIgd52);">
-	<!ENTITY st20 "fill:url(#AIgd69);">
-	<!ENTITY st21 "fill:url(#AIgd71);">
-	<!ENTITY st22 "fill:url(#AIgd72);">
-	<!ENTITY st23 "fill:#000000;stroke-width:0.5956;">
-]>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="body" xml:space="preserve" width="520" height="51">
-<g transform="translate(168,0) scale(-1, 1)">
-<g id="Layer_x0020_1">
-	<defs>
-		<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd1" x1="-3510.3682" y1="4186.3037" x2="-3520.3882" y2="4153.2837" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 -2022.5977 2980.6621)">
-			<stop  offset="0" style="stop-color:#4F0C81"/>
-			<stop  offset="0.0701" style="stop-color:#690C73"/>
-			<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-			<stop  offset="0.3368" style="stop-color:#C20748"/>
-			<stop  offset="0.4512" style="stop-color:#E0053A"/>
-			<stop  offset="0.5481" style="stop-color:#F20032"/>
-			<stop  offset="0.6158" style="stop-color:#FA002F"/>
-			<stop  offset="1" style="stop-color:#F7EE5F"/>
-		</linearGradient>
-	</defs>
-	<g style="fill-rule:nonzero;fill:url(#AIgd1);stroke:#000000;stroke-width:0.254;stroke-miterlimit:4;">
-		<path style="&st23;" d="M0.241,40.672c13.561-1.867,63.613-4.393,85.943-8.051c17.961-2.937,35.502-8.285,52.242-13.9c4.328-1.453,11.991-4.434,16.896-7.07c3.104-2.373,10.571-5.889,12.606-9.222c-32.45,15.407-45.513,19.649-83.582,27.354
-			c-15.436,3.169-71.617,7.721-84.105,10.889z"/>
-		<defs>
-			<linearGradient id="AIgd2" gradientUnits="userSpaceOnUse" x1="-3788.0986" y1="-3507.6162" x2="-3789.1638" y2="-3479.4058" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st1;" d="M48.261,46.645l1.454,0.498l1.418,0.118l1.417-0.229l1.417-0.574l1.379-0.766l1.38-0.994l1.305-1.146l1.301-1.226l1.228-1.26l1.149-1.267l1.111-1.224l1.035-1.148l0.958-0.957l0.881-0.763l0.767-0.501l0.689-0.228l-0.576,0.036l-0.611,0.038
-			l-0.689,0.077l-0.688,0.074l-0.69,0.078l-0.689,0.076l-0.689,0.038l-0.612,0.076l-0.957,0.88l-0.921,0.842l-0.805,0.842l-0.729,0.844l-0.727,0.801l-0.688,0.805l-0.652,0.764l-0.691,0.729l-0.688,0.727l-0.729,0.65l-0.767,0.65l-0.882,0.61l-0.919,0.576
-			l-1.034,0.535l-1.149,0.496l-1.302,0.421z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd3" x1="-3817.4316" y1="-3498.7192" x2="-3818.3076" y2="-3475.5176" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st2;" d="M43.511,46.45l1.688,0.271l1.569,0.038l1.455-0.15l1.377-0.345l1.265-0.534l1.151-0.652l1.148-0.766l1.034-0.879l1.035-0.918l0.957-0.995l0.959-1.072l0.921-1.032l0.956-1.033l0.96-1.033l0.958-0.955l0.995-0.881l-0.381,0.037h-0.423
-			l-0.384,0.039l-0.419,0.037l-0.424,0.037l-0.421,0.078l-0.42,0.035l-0.42,0.041l-0.421,0.037l-0.461,0.037l-0.422,0.078l-0.459,0.037l-0.459,0.037l-0.46,0.037h-0.46l-0.459,0.039l-0.347,0.535l-0.42,0.651l-0.537,0.765l-0.575,0.805l-0.69,0.881l-0.729,0.879
-			l-0.766,0.918l-0.805,0.879l-0.844,0.844l-0.84,0.805l-0.885,0.726l-0.842,0.612l-0.844,0.496l-0.843,0.346l-0.804,0.189h-0.768z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd4" x1="-3806.9058" y1="-3505.3105" x2="-3807.8401" y2="-3480.5605" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st3;" d="M40.371,46.487l0.958,0.115l0.919,0.076l0.881-0.037l0.881-0.152l0.882-0.19l0.843-0.344l0.841-0.421l0.883-0.574l0.882-0.65l0.882-0.764l0.882-0.921l0.919-0.993l0.958-1.188l0.997-1.3l1.034-1.416l1.074-1.607l-0.651-0.002l-0.613,0.039
-			l-0.614,0.076l-0.612,0.076l-0.611,0.078l-0.613,0.072h-0.688h-0.727l-0.616,0.612l-0.573,0.65l-0.576,0.614l-0.574,0.688l-0.575,0.65l-0.535,0.689l-0.576,0.648l-0.539,0.691l-0.572,0.65l-0.574,0.65l-0.612,0.65l-0.577,0.613l-0.65,0.572l-0.652,0.574
-			l-0.65,0.573l-0.729,0.499z"/>
-		<path style="&st2;" d="M37.041,46.329l0.728,0.387l0.802,0.153l0.807-0.116l0.842-0.342l0.844-0.5l0.881-0.689l0.88-0.764l0.884-0.917l0.841-0.958l0.884-0.993l0.804-0.997l0.805-0.957l0.768-0.957l0.729-0.84l0.689-0.729l0.614-0.613l-4.099,0.382l-0.462,0.612
-			l-0.498,0.61l-0.458,0.616l-0.459,0.608l-0.46,0.614l-0.5,0.612l-0.461,0.612l-0.497,0.612l-0.537,0.573l-0.537,0.611l-0.536,0.578l-0.613,0.57l-0.612,0.574l-0.653,0.576l-0.688,0.536l-0.728,0.532z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd6" x1="-3825.4375" y1="-3503.8936" x2="-3826.3342" y2="-3480.1453" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st4;" d="M30.262,45.444l1.188,0.767l1.109,0.5l1.11,0.231h1.074l1.033-0.191l0.995-0.343l0.955-0.538l0.96-0.687l0.919-0.841l0.923-0.881l0.84-1.037l0.884-1.031l0.843-1.109l0.844-1.146l0.805-1.148l0.805-1.111l-0.688,0.115l-0.536,0.037
-			l-0.384,0.037l-0.345,0.039l-0.343,0.039l-0.346-0.001l-0.499,0.037l-0.651,0.037l-0.729,1.034l-0.727,0.955l-0.729,0.921l-0.805,0.804l-0.767,0.727l-0.767,0.689l-0.804,0.611l-0.768,0.536l-0.766,0.458l-0.768,0.421l-0.727,0.306l-0.689,0.269l-0.689,0.229
-			l-0.614,0.152l-0.612,0.075l-0.537,0.038z"/>
-		<path style="&st2;" d="M26.7,45.21l1.228,0.153l1.186,0.08l1.149-0.078l1.109-0.151l1.036-0.227l1.033-0.345l0.958-0.422l0.92-0.535l0.92-0.572l0.844-0.651l0.843-0.727l0.803-0.804l0.766-0.842l0.73-0.918l0.729-0.959l0.689-0.994l-0.767,0.039l-0.844,0.074
-			l-0.802,0.076l-0.806,0.038l-0.69,0.077l-0.574,0.035l-0.421,0.039l-0.191,0.037l-0.076,0.078l-0.191,0.19l-0.308,0.306l-0.382,0.385l-0.422,0.459l-0.536,0.536l-0.577,0.573l-0.648,0.614l-0.731,0.608l-0.764,0.65l-0.768,0.615l-0.843,0.611l-0.88,0.572
-			l-0.881,0.535l-0.921,0.46L26.7,45.21z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd8" x1="-3841.6636" y1="-3502.4297" x2="-3842.4236" y2="-3482.3" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st5;" d="M21.991,45.476l1.033,0.192l0.998,0.076l1.033-0.113l1.034-0.191l1.034-0.342l0.994-0.423l0.996-0.497l0.998-0.611l0.919-0.648l0.918-0.69l0.881-0.726l0.845-0.766l0.806-0.804l0.766-0.765l0.69-0.768l0.651-0.766h-0.461l-0.574,0.04
-			l-0.611,0.036H34.29l-0.613,0.073l-0.613,0.041l-0.496,0.039l-0.423,0.075v0.077l-0.154,0.189l-0.381,0.347l-0.537,0.42l-0.652,0.535l-0.764,0.613l-0.845,0.652l-0.882,0.647l-0.92,0.687l-0.918,0.691l-0.881,0.65l-0.846,0.574L23.6,44.559L22.91,44.98
-			l-0.537,0.305l-0.382,0.191z"/>
-		<path style="&st2;" d="M16.782,45.434l0.612,0.612l0.806,0.267l0.996,0.001l1.11-0.266l1.227-0.46l1.262-0.646l1.341-0.768l1.305-0.841l1.302-0.919l1.227-0.916l1.147-0.879l0.999-0.844l0.881-0.688l0.65-0.574l0.423-0.381l0.192-0.154l-0.498,0.038l-0.538,0.036
-			l-0.574,0.037l-0.572,0.041l-0.614,0.072l-0.614,0.039l-0.611,0.04l-0.652,0.038l-0.688,0.419l-0.688,0.422l-0.693,0.456l-0.649,0.425l-0.689,0.456l-0.653,0.498l-0.688,0.459l-0.653,0.459l-0.69,0.496l-0.65,0.461l-0.688,0.459l-0.651,0.458l-0.688,0.421
-			l-0.691,0.422l-0.651,0.419l-0.69,0.384z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd10" x1="-3872.1543" y1="-3503.9727" x2="-3872.3848" y2="-3493.1567" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#F7EE5F"/>
-				<stop  offset="0.186" style="stop-color:#F5D65D"/>
-				<stop  offset="0.3825" style="stop-color:#F4C35B"/>
-				<stop  offset="0.5198" style="stop-color:#F4BC5A"/>
-				<stop  offset="0.7809" style="stop-color:#F5DA5D"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st8;" d="M12.953,45.507l0.652,0.229l0.649,0.115l0.65,0.037l0.653-0.11l0.65-0.194l0.689-0.265l0.727-0.383l0.768-0.46l0.843-0.535l0.881-0.612l0.959-0.688l1.072-0.728l1.187-0.803l1.265-0.881l1.379-0.918l1.534-0.957l-0.653,0.039l-0.727,0.039
-			l-0.65-0.001l-0.65,0.038l-0.574,0.037l-0.459,0.038l-0.307,0.039l-0.116,0.036l-0.077,0.115l-0.229,0.23l-0.346,0.307l-0.458,0.42L21.69,40.19l-0.653,0.577l-0.689,0.571l-0.805,0.613l-0.805,0.611l-0.843,0.612l-0.843,0.534l-0.882,0.537l-0.842,0.457
-			l-0.842,0.383l-0.805,0.267l-0.729,0.154z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd11" x1="-3878.0732" y1="-3508.4204" x2="-3874.5449" y2="-3484.9487" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#F7EE5F"/>
-				<stop  offset="0.186" style="stop-color:#F5D65D"/>
-				<stop  offset="0.3825" style="stop-color:#F4C35B"/>
-				<stop  offset="0.5198" style="stop-color:#F4BC5A"/>
-				<stop  offset="0.7809" style="stop-color:#F5DA5D"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st9;" d="M10.158,45.084l0.879,0.344l0.958,0.152l0.998-0.072l1.033-0.268l1.072-0.383l1.033-0.498l1.074-0.608l0.996-0.69l0.958-0.688l0.92-0.728l0.843-0.688l0.728-0.691l0.653-0.572l0.495-0.499l0.383-0.341l0.232-0.232l-0.613,0.038l-0.577,0.04
-			l-0.571,0.037l-0.575,0.074l-0.535,0.041l-0.577,0.037l-0.61,0.074l-0.613,0.038l-0.459,0.421l-0.501,0.42l-0.458,0.421l-0.499,0.46l-0.498,0.498l-0.497,0.459l-0.536,0.459l-0.538,0.458l-0.536,0.423l-0.534,0.421l-0.577,0.381l-0.534,0.343l-0.614,0.309
-			l-0.574,0.266l-0.613,0.193l-0.613,0.152z"/>
-		<path style="&st8;" d="M6.791,44.01l0.765,0.535l0.763,0.345l0.767,0.154l0.767,0.039l0.768-0.151l0.766-0.232l0.766-0.343l0.765-0.458l0.729-0.498l0.766-0.611l0.729-0.613l0.729-0.65l0.727-0.648l0.69-0.69l0.689-0.649l0.69-0.615l-0.422,0.041l-0.46,0.076
-			l-0.497,0.037l-0.535,0.039l-0.575,0.074l-0.612,0.039l-0.652,0.074l-0.612,0.037l-0.192,0.461L13.84,40.26l-0.271,0.422l-0.346,0.422l-0.381,0.383l-0.424,0.383l-0.42,0.381l-0.496,0.306l-0.5,0.308l-0.537,0.268l-0.573,0.268L9.316,43.59l-0.612,0.154
-			l-0.61,0.15L7.44,43.971L6.791,44.01z"/>
-		<path style="&st9;" d="M3.763,43.434L4.415,43.7l0.69,0.193l0.726,0.115l0.806,0.001l0.767-0.038l0.842-0.115l0.805-0.229l0.803-0.229l0.768-0.344l0.729-0.384l0.65-0.421l0.614-0.495l0.536-0.538l0.46-0.572l0.345-0.651l0.23-0.652l-0.46,0.04l-0.46,0.037
-			l-0.497,0.076l-0.5,0.038l-0.495,0.038l-0.537,0.037l-0.574,0.039l-0.652,0.036L9.74,40.067l-0.307,0.384l-0.306,0.345l-0.306,0.306l-0.307,0.306l-0.348,0.229l-0.343,0.27l-0.347,0.229l-0.381,0.191l-0.422,0.19l-0.421,0.19L5.796,42.86l-0.462,0.152
-			l-0.495,0.152L4.302,43.28l-0.539,0.154z"/>
-		<path style="&st8;" d="M2.193,42.896l0.23,0.229l0.347,0.152l0.42,0.078h0.46l0.536-0.038l0.573-0.112l0.613-0.193l0.612-0.189l0.613-0.27l0.614-0.307l0.612-0.342l0.537-0.385l0.537-0.42l0.458-0.459l0.345-0.46l0.307-0.498l-0.343,0.041l-0.308,0.037
-			l-0.383,0.038L8.63,39.836l-0.344,0.039l-0.307,0.036l-0.268,0.001l-0.269-0.001v0.153L7.1,40.37l-0.576,0.422L5.757,41.29L4.84,41.786l-0.922,0.499l-0.919,0.381l-0.806,0.23z"/>
-		<path style="&st8;" d="M1.084,41.822l0.078,0.536l0.192,0.344l0.305,0.155l0.42,0.076l0.499-0.075l0.574-0.192l0.573-0.229l0.614-0.306l0.613-0.346l0.574-0.381l0.575-0.381l0.461-0.347l0.42-0.307l0.307-0.229l0.191-0.152l0.038-0.076l-2.986,0.341l-0.229,0.152
-			l-0.386,0.192l-0.458,0.23l-0.5,0.229l-0.535,0.269l-0.497,0.189l-0.461,0.192l-0.384,0.114z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd16" x1="-3892.5645" y1="-3497.0415" x2="-3892.7126" y2="-3490.0823" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#F7EE5F"/>
-				<stop  offset="0.186" style="stop-color:#F5D65D"/>
-				<stop  offset="0.3825" style="stop-color:#F4C35B"/>
-				<stop  offset="0.5198" style="stop-color:#F4BC5A"/>
-				<stop  offset="0.7809" style="stop-color:#F5DA5D"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st10;" d="M4.533,40.253l-0.651,0.039l-0.574,0.039l-0.536,0.036l-0.498,0.037l-0.46,0.04l-0.497,0.036l-0.498,0.077l-0.577,0.114l0.117,0.729l0.343,0.345l0.537,0.001l0.689-0.19l0.689-0.347l0.729-0.382l0.651-0.345l0.536-0.229z"/>
-		<path style="&st8;" d="M4.419,39.874l-0.653,0.112l-0.573,0.076l-0.497,0.114l-0.5,0.075l-0.458,0.114l-0.459,0.115l-0.537,0.116L0.167,40.75l-0.038-0.844l0.345-0.536l0.537-0.192l0.727-0.034l0.766,0.151l0.766,0.193l0.651,0.23l0.499,0.154z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd18" x1="-3716.793" y1="-3522.1724" x2="-3726.813" y2="-3555.1924" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st11;" d="M44.258,24.317l1.684-0.651l1.611-0.419l1.491-0.113l1.417,0.076l1.379,0.309l1.262,0.459l1.227,0.652l1.187,0.729l1.149,0.845l1.11,0.919l1.106,0.959l1.074,0.996l1.071,0.957l1.07,0.921l1.073,0.882l1.109,0.807l-0.384,0.073
-			l-0.421,0.038l-0.421,0.039l-0.383,0.076l-0.423,0.039l-0.421,0.038l-0.459,0.036l-0.421,0.039l-0.422,0.035l-0.461,0.041l-0.458,0.076l-0.422,0.037l-0.461,0.04l-0.457,0.074l-0.498,0.037l-0.461,0.077l-0.382-0.534l-0.495-0.653l-0.576-0.766l-0.688-0.768
-			l-0.727-0.843l-0.805-0.843l-0.879-0.844l-0.881-0.806l-0.959-0.766l-0.953-0.688l-0.957-0.615l-0.997-0.497l-0.957-0.385l-0.958-0.23l-0.956-0.039l-0.88,0.152z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd19" x1="-3818.3081" y1="-3506.1616" x2="-3836.2568" y2="-3532.4282" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st12;" d="M41.383,24.964l0.96-0.345l0.92-0.227l0.878-0.152l0.923-0.077l0.878,0.077l0.919,0.192l0.88,0.268l0.919,0.423l0.956,0.537l0.959,0.691l0.995,0.803l1.033,0.96l1.108,1.11l1.11,1.266l1.186,1.418l1.264,1.57l-0.69,0.039l-0.611,0.072
-			l-0.576,0.039l-0.534,0.076l-0.537,0.076l-0.573,0.076l-0.653,0.113l-0.765,0.117l-0.689-0.574l-0.65-0.613l-0.689-0.653l-0.612-0.653l-0.649-0.649l-0.649-0.65l-0.613-0.653l-0.651-0.651l-0.651-0.612l-0.688-0.574l-0.651-0.576l-0.688-0.574l-0.727-0.498
-			l-0.767-0.423l-0.766-0.421l-0.805-0.347z"/>
-		<path style="&st11;" d="M38.167,25.805l0.727-0.611l0.808-0.307l0.88-0.074l0.879,0.191l0.958,0.383l0.956,0.538l0.995,0.688l0.996,0.805l0.996,0.881l0.993,0.921l0.956,0.921l0.92,0.958l0.841,0.88l0.84,0.805l0.729,0.691l0.69,0.574l-4.176,0.496l-0.536-0.613
-			l-0.536-0.615l-0.498-0.613l-0.533-0.611l-0.537-0.613l-0.534-0.651l-0.573-0.614l-0.535-0.576l-0.613-0.574l-0.612-0.573l-0.652-0.538l-0.688-0.498l-0.728-0.497l-0.766-0.423l-0.804-0.383l-0.843-0.346z"/>
-		<path style="&st12;" d="M31.886,28.481l1.148-1.111l1.111-0.802l1.073-0.534l1.072-0.307l1.072-0.037l1.034,0.154l1.033,0.385l0.996,0.498l0.994,0.689l0.955,0.804l0.996,0.921l0.919,0.996l0.957,1.035l0.917,1.111l0.918,1.111l0.919,1.11l-0.729,0.04
-			l-0.611,0.035l-0.498,0.039l-0.461,0.076l-0.458,0.076l-0.499,0.075l-0.571,0.078l-0.692,0.112l-0.803-1.034l-0.766-0.919l-0.803-0.844l-0.766-0.728l-0.802-0.612l-0.766-0.538l-0.728-0.461l-0.768-0.382l-0.728-0.309l-0.688-0.229l-0.728-0.192l-0.689-0.152
-			l-0.648-0.08l-0.653-0.074h-0.649l-0.612-0.002z"/>
-		<path style="&st11;" d="M27.402,29.512l1.267-0.461l1.187-0.344l1.187-0.189l1.109-0.077l1.111,0.001l1.071,0.155l1.035,0.231l0.996,0.347l0.995,0.419l0.919,0.537l0.957,0.613l0.878,0.689l0.882,0.768l0.84,0.842l0.806,0.922l0.803,0.996l-0.803,0.115
-			l-0.919,0.111l-0.921,0.115l-0.921,0.115l-0.842,0.113L38.39,35.61l-0.499,0.037l-0.191-0.002l-0.075-0.075l-0.192-0.153l-0.269-0.268l-0.343-0.346l-0.423-0.42l-0.495-0.424l-0.575-0.496l-0.65-0.538l-0.728-0.499l-0.765-0.536l-0.844-0.5l-0.918-0.495
-			l-0.92-0.424l-0.993-0.383l-1.034-0.348l-1.073-0.229z"/>
-		<path style="&st12;" d="M21.735,30.196l1.034-0.418l1.035-0.307l1.108-0.115l1.073,0.001l1.111,0.118l1.108,0.229l1.072,0.346l1.111,0.422l1.033,0.498l1.033,0.537l0.995,0.651l0.994,0.651l0.882,0.693l0.881,0.727l0.802,0.728l0.726,0.729l-0.495,0.037
-			l-0.612,0.076l-0.689,0.075l-0.728,0.077l-0.729,0.075l-0.652,0.076l-0.573,0.037h-0.422l-0.001-0.077l-0.191-0.191l-0.38-0.268l-0.574-0.385l-0.689-0.42l-0.805-0.5l-0.919-0.537l-0.956-0.533l-0.955-0.54l-0.996-0.538l-0.998-0.496l-0.916-0.457l-0.846-0.387
-			l-0.762-0.307l-0.616-0.193l-0.495-0.115z"/>
-		<path style="&st11;" d="M16.373,31.303l0.537-0.842l0.805-0.498l0.996-0.188h1.147l1.264,0.268l1.379,0.422l1.455,0.576l1.415,0.651l1.455,0.729l1.339,0.766l1.265,0.73l1.149,0.727l0.954,0.615l0.729,0.459l0.496,0.342l0.23,0.117l-0.537,0.116l-0.61,0.077
-			l-0.653,0.073l-0.689,0.038l-0.727,0.078l-0.729,0.074l-0.688,0.115l-0.689,0.115l-0.729-0.346l-0.688-0.348l-0.729-0.381l-0.688-0.385l-0.69-0.346l-0.688-0.383l-0.728-0.384l-0.688-0.382l-0.689-0.35l-0.688-0.382l-0.729-0.343l-0.688-0.307l-0.689-0.348
-			l-0.727-0.305l-0.727-0.311l-0.729-0.266z"/>
-		<path style="&st8;" d="M9.518,33.135l0.844-0.611l0.956-0.346l0.996-0.149l1.07,0.001l1.113,0.189l1.148,0.348l1.11,0.421l1.108,0.5l1.035,0.574l1.032,0.575l0.919,0.614l0.804,0.536l0.727,0.499l0.574,0.46l0.42,0.306l0.229,0.193l-0.612,0.074l-0.574,0.077
-			l-0.495,0.076l-0.501,0.037l-0.536,0.037l-0.496,0.076L19.813,37.7l-0.61,0.074l-0.537-0.342l-0.536-0.348l-0.574-0.42l-0.574-0.383L16.37,35.86l-0.613-0.421l-0.612-0.423l-0.612-0.383l-0.614-0.384l-0.647-0.308l-0.652-0.305l-0.613-0.232l-0.648-0.189
-			l-0.615-0.117H10.13l-0.612,0.037z"/>
-		<path style="&st9;" d="M12.044,32.029l0.653-0.423l0.688-0.305l0.652-0.154l0.688-0.074l0.689,0.037l0.728,0.152l0.807,0.27l0.838,0.308l0.921,0.423l0.959,0.459l1.07,0.576l1.147,0.614l1.265,0.65l1.378,0.692l1.49,0.765l1.648,0.768l-0.613,0.04L26.363,36.9
-			l-0.688,0.078l-0.691,0.112l-0.613,0.078l-0.457,0.078l-0.346,0.035l-0.153-0.035l-0.075-0.079l-0.27-0.19l-0.345-0.309l-0.459-0.344l-0.573-0.422l-0.689-0.459l-0.729-0.5l-0.803-0.499l-0.879-0.498l-0.882-0.497l-0.955-0.425l-0.957-0.384l-0.959-0.304
-			l-0.957-0.196l-0.92-0.111l-0.919-0.001z"/>
-		<path style="&st9;" d="M6.451,35.086l0.691-0.766l0.726-0.574l0.729-0.382l0.766-0.229l0.767-0.037l0.804,0.076l0.844,0.192l0.804,0.271l0.84,0.422l0.805,0.42l0.842,0.536l0.843,0.539l0.843,0.536l0.803,0.574l0.805,0.578l0.803,0.496l-0.459,0.076l-0.498,0.038
-			l-0.574,0.116l-0.613,0.072l-0.649,0.079l-0.69,0.073l-0.65,0.078l-0.653,0.075l-0.229-0.497l-0.269-0.422l-0.305-0.422l-0.384-0.383l-0.383-0.344l-0.419-0.27l-0.5-0.271l-0.497-0.229l-0.536-0.191l-0.572-0.154L9.706,35.05l-0.612-0.079l-0.65-0.037
-			l-0.652,0.001l-0.65,0.073l-0.689,0.078z"/>
-		<path style="&st9;" d="M1.738,37.609l0.193-0.306l0.306-0.268l0.422-0.228l0.459-0.154l0.536-0.114l0.612-0.036l0.613,0.001l0.689,0.037l0.65,0.114l0.689,0.155l0.652,0.229l0.61,0.269l0.576,0.308l0.534,0.383l0.422,0.422l0.381,0.461l-0.343,0.076L9.32,39.034
-			L8.9,39.11l-0.423,0.074l-0.382,0.037l-0.308,0.041H7.56H7.482l-0.153-0.078l-0.381-0.23l-0.652-0.307L5.53,38.304l-0.881-0.309l-0.995-0.269l-0.957-0.154l-0.959,0.036z"/>
-		<path style="&st8;" d="M0.818,39.178l-0.036-0.609l0.152-0.461l0.271-0.307l0.42-0.191l0.497-0.078l0.575,0.041l0.613,0.076l0.688,0.154l0.65,0.229l0.65,0.231l0.613,0.23l0.535,0.23l0.46,0.23l0.383,0.154l0.191,0.152l0.078,0.036l-3.065,0.533l-0.27-0.112
-			l-0.42-0.117l-0.459-0.153L2.81,39.294l-0.536-0.115l-0.535-0.074L1.24,39.104l-0.422,0.074z"/>
-		<path style="&st8;" d="M3.349,36.616l0.612-0.498l0.651-0.383l0.729-0.342l0.805-0.231l0.806-0.153l0.803-0.11l0.844,0.001l0.841,0.072l0.804,0.156l0.804,0.27l0.729,0.307l0.689,0.383l0.649,0.461l0.536,0.535l0.421,0.613l0.344,0.689l-0.499,0.039l-0.457,0.077
-			l-0.5,0.036l-0.536,0.076l-0.535,0.078l-0.574,0.037L10.7,38.844l-0.65,0.072l-0.231-0.341l-0.268-0.308L9.244,38l-0.343-0.27L8.519,37.5l-0.421-0.23l-0.423-0.192l-0.459-0.151l-0.459-0.154L6.26,36.657L5.8,36.581l-0.499-0.04l-0.497-0.037l-0.496-0.001
-			l-0.499,0.038l-0.46,0.075z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd31" x1="-3644.5117" y1="-3531.5527" x2="-3636.6318" y2="-3508.3506" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#681083"/>
-				<stop  offset="0.0006" style="stop-color:#681083"/>
-				<stop  offset="0.072" style="stop-color:#8D0F6D"/>
-				<stop  offset="0.1459" style="stop-color:#AD0D5A"/>
-				<stop  offset="0.2229" style="stop-color:#C80A4A"/>
-				<stop  offset="0.3041" style="stop-color:#DE083E"/>
-				<stop  offset="0.3913" style="stop-color:#ED0335"/>
-				<stop  offset="0.4884" style="stop-color:#F60030"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st13;" d="M139.689,18.299l0.077,0.117l0.192,0.307l0.267,0.497l0.344,0.613l0.386,0.727l0.382,0.806l0.346,0.92l0.303,0.918l0.228,0.959l0.079,0.92L142.251,26l-0.192,0.842l-0.422,0.768l-0.651,0.687l-0.919,0.535l-1.189,0.384l0.193-0.578
-			l0.117-0.611l0.113-0.611l0.076-0.689l0.039-0.689V25.31l-0.037-0.69l-0.037-0.729l-0.076-0.729l-0.074-0.725l-0.116-0.69l-0.152-0.651l-0.113-0.651l-0.154-0.575l-0.188-0.574l-0.155-0.498l0.191-0.075l0.154-0.04l0.19-0.076l0.156-0.036l0.153-0.077l0.15-0.039
-			l0.191-0.078l0.19-0.076z"/>
-		<path style="&st13;" d="M138.389,18.835l0.534,2.108l0.382,1.914l0.189,1.646l0.037,1.455l-0.077,1.264l-0.23,1.072l-0.307,0.92l-0.347,0.764l-0.46,0.613l-0.497,0.496l-0.498,0.347l-0.495,0.267l-0.54,0.191l-0.459,0.076l-0.42,0.037h-0.384l0.229-0.613
-			l0.229-0.612l0.192-0.688l0.154-0.689l0.152-0.767l0.118-0.764l0.116-0.767l0.075-0.803l0.041-0.806l0.001-0.843l-0.041-0.804l-0.073-0.843l-0.114-0.804l-0.155-0.843l-0.188-0.766l-0.229-0.805l0.457-0.154l0.463-0.152l0.422-0.152l0.418-0.115l0.348-0.113
-			l0.381-0.115l0.306-0.076l0.27-0.077z"/>
-		<path style="&st13;" d="M135.285,19.792l0.231,0.765l0.227,0.959l0.155,1.073l0.072,1.186l0.041,1.303l-0.002,1.301l-0.116,1.301l-0.192,1.267l-0.271,1.187l-0.345,1.109l-0.499,0.957l-0.572,0.766l-0.731,0.574l-0.84,0.304l-0.96,0.04l-1.108-0.307l0.422-0.691
-			l0.421-0.727l0.347-0.766l0.307-0.727l0.229-0.803l0.231-0.768l0.152-0.805l0.154-0.805l0.077-0.804l0.038-0.841v-0.805l-0.073-0.842l-0.076-0.842l-0.152-0.806l-0.152-0.845l-0.229-0.803l0.383-0.152l0.458-0.152l0.461-0.153l0.46-0.153l0.46-0.151l0.382-0.153
-			l0.346-0.117l0.267-0.074z"/>
-		<path style="&st13;" d="M125.546,35.674l1.036,0.08l0.997-0.154l0.879-0.381l0.805-0.535l0.766-0.73l0.652-0.879l0.536-0.994l0.499-1.109l0.384-1.188l0.309-1.266l0.192-1.3l0.078-1.302l0.001-1.301l-0.114-1.303l-0.229-1.265l-0.343-1.188l-0.422,0.152
-			l-0.425,0.154l-0.456,0.114l-0.463,0.152l-0.458,0.154l-0.497,0.153l-0.46,0.152l-0.497,0.152v0.804l-0.001,0.879l-0.04,0.999l-0.039,1.033l-0.039,1.033l-0.038,1.072l-0.116,1.11l-0.113,1.032l-0.156,1.035L127.62,32l-0.233,0.919l-0.268,0.806l-0.308,0.687
-			l-0.384,0.577l-0.421,0.419l-0.461,0.267z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd35" x1="-3738.23" y1="-3453.355" x2="-3733.0664" y2="-3424.071" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2110.5286 1859.3658)">
-				<stop  offset="0" style="stop-color:#681083"/>
-				<stop  offset="0.0752" style="stop-color:#6F1182"/>
-				<stop  offset="0.1935" style="stop-color:#831380"/>
-				<stop  offset="0.3399" style="stop-color:#A3157B"/>
-				<stop  offset="0.5088" style="stop-color:#D11975"/>
-				<stop  offset="0.6158" style="stop-color:#F21B71"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st14;" d="M128.277,22.083l-0.384,0.153l-0.383,0.114l-0.343,0.115l-0.386,0.077l-0.382,0.114l-0.347,0.113l-0.384,0.116l-0.38,0.153l-0.077,0.766l-0.041,0.84l-0.039,0.92l-0.038,0.958l-0.001,0.958l-0.001,1.031l-0.04,1.037l-0.039,0.994
-			l-0.076,0.997l-0.115,0.994l-0.193,0.919l-0.191,0.844l-0.305,0.802l-0.346,0.727l-0.422,0.616l-0.536,0.496l1.108-0.268l0.919-0.383l0.767-0.533l0.651-0.614l0.537-0.729l0.423-0.839l0.306-0.919l0.232-0.959l0.156-1.072l0.112-1.11l0.039-1.15l0.042-1.225
-			l0.037-1.225l0.039-1.264l0.001-1.264l0.078-1.303z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd36" x1="-3716.3066" y1="-3509.6641" x2="-3713.6802" y2="-3491.7153" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#681083"/>
-				<stop  offset="0.0006" style="stop-color:#681083"/>
-				<stop  offset="0.072" style="stop-color:#8D0F6D"/>
-				<stop  offset="0.1459" style="stop-color:#AD0D5A"/>
-				<stop  offset="0.2229" style="stop-color:#C80A4A"/>
-				<stop  offset="0.3041" style="stop-color:#DE083E"/>
-				<stop  offset="0.3913" style="stop-color:#ED0335"/>
-				<stop  offset="0.4884" style="stop-color:#F60030"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st15;" d="M118.116,38.426l1.531-0.074l1.304-0.305l1.07-0.497l0.882-0.651l0.689-0.842l0.502-0.958l0.419-1.071l0.27-1.188l0.154-1.226l0.114-1.261l0.041-1.305l0.001-1.262l0.001-1.305l0.001-1.223l0.076-1.15l0.078-1.071l-0.421,0.114
-			l-0.383,0.113l-0.343,0.117l-0.387,0.113l-0.382,0.113l-0.343,0.115l-0.384,0.077l-0.423,0.114l0.039,0.113l0.075,0.269l0.078,0.423l0.114,0.537l0.074,0.688l0.078,0.768l0.039,0.881l-0.04,0.996l-0.114,1.035l-0.195,1.145l-0.347,1.189l-0.42,1.225l-0.614,1.265
-			l-0.766,1.339l-0.921,1.3l-1.15,1.339z"/>
-		<path style="&st15;" d="M112.905,40.07l1.035,0.191l1.035-0.073l0.995-0.346l0.996-0.537l0.956-0.725l0.92-0.881l0.844-1.07l0.769-1.188l0.649-1.265l0.576-1.378l0.462-1.456l0.309-1.489l0.192-1.496l0.041-1.531l-0.152-1.454l-0.308-1.456l-3.638,1.146
-			l0.037,0.613l0.037,0.729l-0.038,0.801l-0.08,0.92l-0.112,0.958l-0.192,1.034l-0.192,1.072l-0.308,1.109l-0.347,1.109l-0.421,1.073l-0.461,1.071l-0.575,1.035l-0.612,0.995l-0.729,0.919l-0.805,0.841l-0.883,0.727z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd38" x1="-3716.5049" y1="-3512.9565" x2="-3712.3662" y2="-3473.3286" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#681083"/>
-				<stop  offset="0.0006" style="stop-color:#681083"/>
-				<stop  offset="0.072" style="stop-color:#8D0F6D"/>
-				<stop  offset="0.1459" style="stop-color:#AD0D5A"/>
-				<stop  offset="0.2229" style="stop-color:#C80A4A"/>
-				<stop  offset="0.3041" style="stop-color:#DE083E"/>
-				<stop  offset="0.3913" style="stop-color:#ED0335"/>
-				<stop  offset="0.4884" style="stop-color:#F60030"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st16;" d="M118.662,24.987l-0.573,0.189l-0.729,0.191l-0.807,0.268l-0.84,0.229l-0.806,0.27l-0.804,0.227l-0.689,0.191l-0.537,0.115l-0.076,0.881l-0.042,0.955l-0.075,0.959l-0.038,0.995l-0.117,0.995l-0.077,1.037l-0.115,0.994l-0.153,0.996
-			l-0.19,0.956l-0.232,0.921l-0.309,0.916l-0.344,0.842l-0.422,0.807l-0.498,0.688l-0.536,0.65l-0.65,0.576l0.766,0.114l0.803-0.038l0.804-0.19l0.805-0.343l0.804-0.5l0.807-0.612l0.768-0.763l0.766-0.958l0.689-1.034l0.611-1.227l0.578-1.339l0.495-1.528
-			l0.388-1.65l0.307-1.758l0.194-1.955l0.077-2.066z"/>
-		<path style="&st15;" d="M103.98,41.593l1.725,0.081l1.455-0.154l1.265-0.418l0.998-0.653l0.841-0.802l0.691-0.958l0.497-1.072l0.386-1.224l0.308-1.225l0.19-1.343l0.116-1.3l0.117-1.302l0.038-1.303l0.078-1.188l0.075-1.11l0.117-0.995l-0.535,0.114l-0.463,0.115
-			l-0.419,0.153l-0.418,0.112l-0.463,0.117l-0.422,0.111l-0.496,0.154l-0.576,0.151l-0.116,1.038l-0.112,0.992l-0.116,0.996l-0.156,0.955l-0.116,0.961l-0.153,0.918l-0.189,0.879l-0.194,0.881l-0.269,0.844l-0.308,0.841l-0.382,0.805l-0.422,0.806l-0.536,0.801
-			l-0.576,0.767l-0.689,0.728l-0.77,0.726z"/>
-		<path style="&st16;" d="M99.349,42.433l1.532,0.078l1.34-0.192l1.188-0.418l1.036-0.65l0.88-0.805l0.766-0.957l0.615-1.107l0.537-1.188l0.458-1.227l0.347-1.3l0.269-1.266l0.194-1.299l0.19-1.226l0.116-1.15l0.116-1.073l0.079-0.919l-0.539,0.117l-0.459,0.112
-			l-0.42,0.115l-0.423,0.077l-0.38,0.113l-0.425,0.074l-0.495,0.152l-0.576,0.115l-0.192,1.496l-0.229,1.417l-0.27,1.301l-0.269,1.226l-0.31,1.109l-0.345,1.071l-0.383,0.919l-0.384,0.883l-0.383,0.803l-0.425,0.727l-0.459,0.613l-0.422,0.573l-0.459,0.536
-			l-0.461,0.42l-0.498,0.383l-0.459,0.345z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd41" x1="-3711.1768" y1="-3514.0366" x2="-3709.7402" y2="-3493.4663" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#681083"/>
-				<stop  offset="0.0006" style="stop-color:#681083"/>
-				<stop  offset="0.072" style="stop-color:#8D0F6D"/>
-				<stop  offset="0.1459" style="stop-color:#AD0D5A"/>
-				<stop  offset="0.2229" style="stop-color:#C80A4A"/>
-				<stop  offset="0.3041" style="stop-color:#DE083E"/>
-				<stop  offset="0.3913" style="stop-color:#ED0335"/>
-				<stop  offset="0.4884" style="stop-color:#F60030"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st17;" d="M94.98,43.004l1.457,0.078l1.302-0.189l1.151-0.424l1.071-0.611l0.881-0.802l0.805-0.919l0.69-1.072l0.614-1.146l0.535-1.189l0.422-1.263l0.347-1.264l0.308-1.262l0.271-1.188l0.192-1.149l0.152-1.031l0.155-0.922l-0.459,0.076l-0.46,0.116
-			l-0.462,0.114l-0.459,0.115l-0.462,0.115l-0.458,0.112l-0.46,0.114l-0.497,0.117l-0.038,0.725l-0.116,0.805l-0.153,0.843l-0.269,0.918l-0.27,0.995l-0.382,0.957l-0.385,1.033l-0.422,0.998l-0.499,0.996l-0.537,0.957l-0.534,0.879l-0.577,0.84l-0.574,0.806
-			l-0.614,0.69l-0.649,0.572l-0.617,0.459z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd42" x1="-3718.4951" y1="-3510.1016" x2="-3716.7441" y2="-3482.9595" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#681083"/>
-				<stop  offset="0.0006" style="stop-color:#681083"/>
-				<stop  offset="0.072" style="stop-color:#8D0F6D"/>
-				<stop  offset="0.1459" style="stop-color:#AD0D5A"/>
-				<stop  offset="0.2229" style="stop-color:#C80A4A"/>
-				<stop  offset="0.3041" style="stop-color:#DE083E"/>
-				<stop  offset="0.3913" style="stop-color:#ED0335"/>
-				<stop  offset="0.4884" style="stop-color:#F60030"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st18;" d="M90.197,43.881l1.49,0.193l1.38-0.191l1.264-0.496l1.15-0.766l1.073-0.955l0.921-1.148l0.84-1.301l0.77-1.341l0.613-1.415l0.537-1.381l0.46-1.302l0.384-1.262l0.23-1.074l0.192-0.88l0.114-0.65l0.001-0.381l-0.573,0.111l-0.537,0.115
-			l-0.535,0.152l-0.536,0.115l-0.536,0.152l-0.5,0.113l-0.497,0.115l-0.499,0.078l-0.191,0.651l-0.19,0.765l-0.229,0.879l-0.271,0.996l-0.308,1.035l-0.343,1.071l-0.384,1.069l-0.424,1.114l-0.461,1.07l-0.497,0.995l-0.537,0.959l-0.574,0.842l-0.653,0.725
-			l-0.65,0.574l-0.728,0.422l-0.765,0.229z"/>
-		<path style="&st18;" d="M86.712,43.688l1.377,0.307l1.223,0.001l1.113-0.267l1.034-0.535l0.882-0.729l0.805-0.881l0.727-1.068l0.652-1.15l0.539-1.226l0.498-1.261l0.384-1.265l0.385-1.227l0.307-1.147l0.231-1.035l0.23-0.918l0.189-0.727l-0.419,0.076
-			l-0.423,0.038l-0.38,0.075l-0.347,0.076l-0.384,0.076l-0.346,0.078l-0.305,0.074l-0.345,0.041l-0.118,0.879l-0.189,0.919l-0.232,0.917l-0.228,0.883l-0.309,0.918l-0.347,0.881l-0.382,0.844l-0.461,0.842l-0.46,0.842l-0.537,0.804l-0.615,0.765l-0.61,0.688
-			l-0.729,0.69l-0.727,0.611l-0.806,0.574l-0.879,0.535z"/>
-		<path style="&st16;" d="M82.345,44.374l1.147,0.002l1.112-0.115l1.07-0.268l1.037-0.384l0.956-0.533l0.959-0.65l0.842-0.763l0.841-0.842l0.73-0.96l0.69-1.032l0.614-1.15l0.573-1.186l0.461-1.264l0.385-1.34l0.347-1.379l0.23-1.414l-0.498,0.113l-0.499,0.076
-			l-0.536,0.115l-0.496,0.074l-0.497,0.078l-0.459,0.112l-0.5,0.077l-0.459,0.115l-0.231,0.805l-0.191,0.842l-0.231,0.805l-0.194,0.803l-0.23,0.804l-0.228,0.804l-0.307,0.766l-0.346,0.804l-0.42,0.767l-0.463,0.803l-0.576,0.766l-0.688,0.766l-0.768,0.729
-			l-0.918,0.765l-1.073,0.766l-1.188,0.726z"/>
-		<path style="&st16;" d="M76.14,45.095l1.495,0.118l1.454-0.076l1.34-0.229l1.266-0.382l1.187-0.497l1.112-0.649l1.033-0.768l0.918-0.917l0.844-0.955l0.767-1.073l0.693-1.148l0.573-1.222l0.496-1.304l0.425-1.34l0.307-1.377l0.233-1.381l-0.423,0.076l-0.46,0.117
-			l-0.456,0.074l-0.461,0.075l-0.459,0.078l-0.5,0.114l-0.497,0.076l-0.5,0.115l-0.152,0.955l-0.23,0.957l-0.31,0.96l-0.383,0.917l-0.457,0.918l-0.502,0.918l-0.574,0.882l-0.648,0.843l-0.691,0.844l-0.767,0.762l-0.808,0.727l-0.879,0.689l-0.921,0.611
-			l-0.995,0.575l-0.997,0.497l-1.072,0.419z"/>
-		<path style="&st15;" d="M72.732,45.475l1.264-0.075l1.226-0.189l1.228-0.306l1.186-0.458l1.112-0.536l1.109-0.648l1.034-0.729l0.958-0.842l0.881-0.917l0.843-0.993l0.73-1.076l0.65-1.109l0.536-1.184l0.46-1.226l0.348-1.267l0.229-1.299l-0.419,0.074l-0.385,0.037
-			l-0.346,0.039l-0.343,0.039l-0.346,0.037l-0.382,0.077L83.849,33l-0.539,0.075l-0.537,1.112l-0.459,1.031l-0.46,0.997l-0.422,0.919l-0.46,0.881l-0.424,0.805l-0.461,0.764l-0.498,0.727l-0.537,0.729l-0.613,0.649l-0.688,0.69l-0.765,0.611l-0.884,0.65
-			l-0.996,0.611l-1.108,0.612l-1.265,0.61z"/>
-		<path style="&st16;" d="M66.604,45.855l1.877,0.077l1.763-0.073l1.57-0.267l1.455-0.422l1.34-0.572l1.187-0.691l1.113-0.801l0.993-0.92l0.921-0.993l0.844-1.072l0.729-1.109l0.688-1.189l0.652-1.184l0.577-1.187l0.538-1.227l0.496-1.187l-0.343,0.036l-0.461,0.078
-			l-0.573,0.076l-0.575,0.076l-0.613,0.115l-0.537,0.076l-0.456,0.076l-0.347,0.035l-0.46,1.074l-0.499,1.074l-0.577,0.994l-0.573,0.955l-0.652,0.881l-0.688,0.879l-0.729,0.804l-0.804,0.807l-0.804,0.727l-0.885,0.688l-0.917,0.688l-0.96,0.613l-0.995,0.572
-			l-1.072,0.535l-1.072,0.496l-1.149,0.46z"/>
-		<path style="&st15;" d="M62.966,46.387L64,46.35l1.071-0.152l1.15-0.269l1.186-0.419l1.188-0.495l1.189-0.613l1.188-0.726l1.187-0.803l1.149-0.918l1.111-0.957l1.035-1.07l0.999-1.15l0.879-1.188l0.804-1.262l0.691-1.34l0.576-1.38l-0.575,0.079l-0.575,0.074
-			l-0.611,0.037l-0.612,0.077l-0.536,0.037l-0.461,0.077l-0.382,0.076l-0.192,0.115l-0.69,0.535l-0.689,0.575l-0.729,0.688l-0.729,0.688l-0.727,0.766l-0.767,0.802l-0.767,0.844l-0.768,0.845l-0.766,0.879l-0.804,0.842l-0.805,0.842l-0.845,0.84l-0.842,0.843
-			l-0.845,0.763L63.848,45.7l-0.882,0.688z"/>
-		<path style="&st16;" d="M57.375,46.383l0.997,0.654l1.032,0.268l1.034,0.001l1.073-0.268l1.071-0.536l1.073-0.729l1.111-0.916l1.11-1.033l1.112-1.188l1.148-1.225l1.189-1.301l1.188-1.299l1.188-1.264l1.226-1.264l1.228-1.148l1.226-1.031h-0.425l-0.494,0.074
-			l-0.576,0.038l-0.573,0.116L72.7,34.411l-0.612,0.113l-0.572,0.115l-0.5,0.075l-0.956,0.88l-0.957,0.88l-0.923,0.919l-0.919,0.919l-0.881,0.916l-0.883,0.921l-0.88,0.92l-0.845,0.84l-0.844,0.84l-0.842,0.768l-0.805,0.688l-0.804,0.613l-0.805,0.535l-0.767,0.459
-			l-0.766,0.343l-0.767,0.229z"/>
-		<path style="&st15;" d="M53.046,46.879l1.572,0.001l1.492-0.151l1.342-0.385l1.304-0.494l1.187-0.614l1.109-0.765l1.075-0.84l0.995-0.92l0.997-0.994l0.956-1.033l0.921-1.035l0.959-1.07l0.959-1.07l0.994-1.034l1.035-0.957l1.072-0.918l-0.382,0.04l-0.458,0.037
-			l-0.577,0.074l-0.572,0.041l-0.577,0.073l-0.459,0.038l-0.382,0.041l-0.229-0.001l-0.651,0.151L66.076,35.4l-0.649,0.423l-0.692,0.573l-0.689,0.687l-0.729,0.805l-0.766,0.844l-0.769,0.915l-0.88,0.958l-0.883,0.955l-0.997,0.996l-1.032,0.959l-1.111,0.955
-			l-1.188,0.88l-1.264,0.802l-1.381,0.729z"/>
-		<path style="&st11;" d="M138.274,15.35v-0.153l0.04-0.42l0.038-0.649l0.04-0.807l0.039-0.957l-0.037-1.033l-0.038-1.072l-0.111-1.111l-0.229-1.033l-0.309-0.996l-0.38-0.882l-0.572-0.728l-0.654-0.537l-0.843-0.307l-1.034-0.039l-1.186,0.306l0.385,0.384
-			l0.343,0.459l0.345,0.574l0.306,0.613l0.305,0.689l0.27,0.689l0.264,0.767l0.271,0.804l0.228,0.767l0.19,0.806l0.194,0.803l0.188,0.766l0.155,0.768l0.152,0.727l0.114,0.65l0.113,0.613l0.19-0.037l0.154-0.037l0.189-0.078l0.155-0.037l0.151-0.079l0.155-0.075
-			l0.192-0.037l0.226-0.078z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd52" x1="-3690.9155" y1="-3526.2993" x2="-3702.7354" y2="-3558.2568" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st19;" d="M136.86,15.925l-0.497-2.489l-0.535-2.108l-0.535-1.801l-0.532-1.492l-0.539-1.188l-0.534-0.958l-0.533-0.689l-0.499-0.497l-0.536-0.347l-0.458-0.153l-0.502-0.039l-0.42,0.078l-0.419,0.152l-0.382,0.191l-0.348,0.229l-0.306,0.23
-			l0.536,0.497l0.533,0.573l0.462,0.538l0.494,0.611l0.424,0.615l0.422,0.648l0.382,0.652l0.344,0.691l0.344,0.727l0.306,0.766l0.307,0.768l0.268,0.805l0.227,0.842l0.23,0.842l0.227,0.882l0.194,0.919l0.457-0.077l0.345-0.036l0.232-0.077l0.153-0.077l0.151-0.037
-			l0.156-0.076L136.632,16l0.229-0.075z"/>
-		<path style="&st11;" d="M134.944,16.651l-0.113-0.918l-0.194-1.035l-0.305-1.15l-0.379-1.226l-0.5-1.264l-0.571-1.227l-0.611-1.187l-0.688-1.111l-0.729-0.996l-0.765-0.843l-0.803-0.65l-0.842-0.425l-0.881-0.152l-0.882,0.152l-0.842,0.499l-0.882,0.878
-			l0.688,0.498l0.65,0.576l0.613,0.574l0.574,0.576l0.574,0.611l0.496,0.689l0.459,0.691l0.42,0.688l0.423,0.769l0.343,0.767l0.345,0.805l0.267,0.842l0.267,0.879l0.193,0.92l0.189,0.959l0.155,0.994l0.416-0.114l0.461-0.152l0.499-0.153l0.498-0.191l0.461-0.189
-			l0.421-0.154l0.344-0.151l0.23-0.077z"/>
-		<path style="&st19;" d="M120.017,6.607l0.919-0.612l0.92-0.344l0.957-0.115l0.919,0.115l0.958,0.307l0.919,0.5l0.882,0.689l0.843,0.805l0.762,0.919l0.766,1.073l0.65,1.188l0.572,1.226l0.496,1.305l0.384,1.376l0.306,1.38l0.151,1.416l-0.46,0.115l-0.459,0.116
-			l-0.46,0.15l-0.46,0.154l-0.497,0.191l-0.499,0.113l-0.457,0.154l-0.498,0.075l-0.346-0.88l-0.305-0.959l-0.383-0.957l-0.348-0.957l-0.379-0.996l-0.419-0.998l-0.423-0.956l-0.421-0.918l-0.456-0.884l-0.499-0.805l-0.533-0.766l-0.539-0.651l-0.609-0.575
-			l-0.615-0.459l-0.648-0.346l-0.69-0.19z"/>
-		<path style="&st11;" d="M115.804,7.75l1.455-0.648l1.302-0.344l1.149-0.038l1.034,0.193l0.919,0.421l0.806,0.65l0.724,0.807l0.65,0.957l0.575,1.072l0.495,1.188l0.5,1.229l0.457,1.225l0.457,1.264l0.421,1.264l0.459,1.188l0.497,1.111l-0.421,0.037l-0.384,0.115
-			l-0.383,0.113l-0.385,0.152l-0.381,0.118l-0.384,0.151l-0.421,0.114l-0.422,0.074l-0.038-0.151l-0.038-0.383l-0.114-0.498l-0.114-0.689l-0.189-0.803l-0.27-0.92l-0.306-0.996l-0.42-1.034l-0.494-1.034l-0.574-1.035l-0.728-1.035l-0.803-0.958l-0.96-0.918
-			l-1.07-0.767l-1.228-0.691l-1.375-0.5z"/>
-		<path style="&st19;" d="M110.366,8.552l0.882-0.651l0.997-0.42l1.069-0.153l1.072,0.04l1.149,0.229l1.148,0.461l1.108,0.615l1.111,0.768l1.07,0.956l0.997,1.075l0.878,1.225l0.805,1.342l0.687,1.416l0.537,1.533l0.342,1.57l0.19,1.687l-3.945,1.029l-0.228-0.649
-			l-0.307-0.77l-0.306-0.803l-0.382-0.881l-0.461-0.92l-0.457-0.956l-0.537-0.961l-0.573-0.956l-0.652-0.957l-0.725-0.92l-0.766-0.842l-0.803-0.808l-0.878-0.728l-0.959-0.613l-0.996-0.537l-1.07-0.421z"/>
-		<path style="&st11;" d="M120.502,21.387l-0.572,0.115l-0.727,0.152l-0.729,0.23l-0.808,0.229l-0.764,0.267l-0.729,0.191l-0.649,0.189l-0.536,0.152l-0.382-0.957l-0.421-0.995l-0.422-0.996l-0.42-1.036l-0.421-1.032l-0.458-0.997l-0.498-0.995l-0.497-0.997
-			l-0.533-0.918l-0.573-0.845l-0.614-0.804l-0.651-0.727l-0.65-0.652l-0.728-0.537l-0.804-0.423l-0.804-0.306l0.692-0.459l0.764-0.344l0.806-0.23l0.88-0.075l0.918,0.076l0.959,0.231l0.957,0.383l0.992,0.576l0.999,0.728l0.993,0.92l0.995,1.149l0.954,1.304
-			l0.919,1.532l0.917,1.723l0.843,1.992l0.802,2.184z"/>
-		<path style="&st11;" d="M101.288,11.34l1.571-0.841l1.415-0.498l1.304-0.114l1.187,0.193l1.032,0.458l0.996,0.691l0.841,0.883l0.805,1.073l0.688,1.188l0.649,1.265l0.573,1.341l0.534,1.34l0.536,1.302l0.498,1.265l0.458,1.148l0.456,1.035l-0.534,0.076
-			l-0.459,0.112l-0.422,0.079l-0.422,0.114l-0.421,0.114l-0.459,0.115l-0.498,0.076l-0.572,0.112l-0.5-1.033l-0.458-1.036l-0.46-0.994l-0.458-0.958l-0.459-0.958l-0.495-0.88l-0.5-0.881l-0.495-0.806l-0.575-0.807l-0.61-0.727l-0.612-0.688l-0.688-0.652
-			l-0.769-0.615l-0.801-0.536l-0.92-0.498l-0.956-0.46z"/>
-		<path style="&st19;" d="M96.537,12.715l1.419-0.765l1.339-0.383l1.265-0.075l1.225,0.191l1.111,0.461l1.069,0.689l0.996,0.844l0.921,0.998l0.841,1.149l0.802,1.187l0.726,1.227l0.652,1.264l0.611,1.266l0.537,1.148l0.455,1.111l0.423,0.957l-0.574,0.113
-			l-0.5,0.115l-0.46,0.113l-0.421,0.076l-0.458,0.115l-0.461,0.115l-0.536,0.076l-0.613,0.115l-0.688-1.533l-0.688-1.417l-0.646-1.302l-0.651-1.188l-0.614-1.071l-0.573-0.961l-0.61-0.84l-0.574-0.807l-0.612-0.651l-0.613-0.575l-0.611-0.498l-0.65-0.421
-			l-0.653-0.308l-0.685-0.269l-0.731-0.155l-0.765-0.113z"/>
-		<path style="&st11;" d="M92.937,13.747l1.378-0.65l1.307-0.308l1.222,0.001l1.19,0.233l1.07,0.458l1.033,0.654l0.956,0.844l0.92,0.957l0.802,1.072l0.766,1.148l0.726,1.188l0.613,1.188l0.609,1.189l0.5,1.15l0.456,1.033l0.421,0.959l-0.459,0.113l-0.42,0.113
-			l-0.424,0.076l-0.383,0.116l-0.421,0.077l-0.42,0.075l-0.462,0.113l-0.496,0.077l-0.231-0.765l-0.342-0.845l-0.42-0.842l-0.497-0.919l-0.535-0.919l-0.651-0.921l-0.649-0.92l-0.728-0.92l-0.765-0.841l-0.805-0.846l-0.803-0.766l-0.804-0.652l-0.843-0.613
-			l-0.805-0.498l-0.802-0.383l-0.806-0.23z"/>
-		<path style="&st19;" d="M88.608,14.852l1.417-0.762l1.38-0.345l1.379,0.039l1.301,0.385l1.264,0.612l1.226,0.879l1.149,1.038l1.069,1.147l0.995,1.229l0.881,1.264l0.8,1.227l0.65,1.187l0.536,1.036l0.422,0.879l0.23,0.652l0.113,0.383l-0.574,0.115l-0.498,0.113
-			l-0.498,0.115l-0.5,0.115l-0.496,0.115l-0.459,0.074l-0.499,0.077l-0.497,0.076l-0.344-0.651l-0.384-0.804l-0.458-0.882l-0.537-0.921l-0.571-1.033l-0.614-1.034l-0.646-0.997l-0.691-1.034l-0.727-0.959l-0.767-0.881l-0.802-0.804l-0.803-0.652l-0.844-0.537
-			l-0.844-0.345l-0.878-0.152l-0.882,0.035z"/>
-		<path style="&st11;" d="M85.468,16.077l1.266-0.842l1.224-0.459l1.149-0.113l1.149,0.19l1.071,0.461l1.033,0.692l0.958,0.842l0.915,1.035l0.844,1.113l0.805,1.184l0.727,1.229l0.687,1.225l0.574,1.15l0.535,1.073l0.421,0.918l0.383,0.766l-0.46,0.077l-0.382,0.114
-			l-0.344,0.115l-0.308,0.113l-0.347,0.114l-0.305,0.115l-0.308,0.078l-0.343,0.073l-0.344-0.955l-0.421-0.958l-0.422-0.921l-0.46-0.918l-0.537-0.919l-0.531-0.844l-0.613-0.844l-0.65-0.805l-0.689-0.767l-0.764-0.688l-0.765-0.614l-0.844-0.574l-0.919-0.5
-			l-0.919-0.421l-0.996-0.308l-1.071-0.229z"/>
-		<path style="&st19;" d="M81.483,16.993l1.113-0.422l1.109-0.266l1.148-0.077l1.074,0.078l1.109,0.231l1.032,0.345l1.034,0.536l1.034,0.652l0.956,0.768l0.918,0.92l0.881,0.996l0.842,1.112l0.802,1.226l0.689,1.34l0.688,1.418l0.571,1.491l-0.498,0.077
-			l-0.495,0.076l-0.501,0.115l-0.497,0.153l-0.496,0.115l-0.498,0.153l-0.497,0.115l-0.5,0.074l-0.343-0.842l-0.343-0.882l-0.347-0.843l-0.342-0.883l-0.422-0.842l-0.419-0.805l-0.501-0.842l-0.534-0.767l-0.649-0.729l-0.688-0.728l-0.805-0.652l-0.88-0.613
-			l-0.996-0.537l-1.11-0.498l-1.261-0.424l-1.381-0.344z"/>
-		<path style="&st11;" d="M75.815,18.329l1.455-0.609l1.457-0.385l1.34-0.189l1.34-0.037l1.265,0.191l1.226,0.346l1.147,0.498l1.111,0.652l0.992,0.805l0.994,0.919l0.884,1.036l0.84,1.15l0.764,1.264l0.652,1.34l0.611,1.381l0.535,1.491l-0.459,0.077l-0.46,0.076
-			l-0.536,0.078l-0.501,0.074l-0.533,0.078l-0.538,0.074l-0.535,0.076l-0.535,0.076l-0.269-1.072l-0.383-0.994l-0.42-0.996l-0.533-0.959l-0.575-0.881L85.5,23.046l-0.688-0.805l-0.766-0.729l-0.842-0.689l-0.916-0.574l-0.959-0.539l-0.995-0.459l-1.071-0.346
-			l-1.112-0.307l-1.146-0.191l-1.188-0.078z"/>
-		<path style="&st19;" d="M73.021,18.632l1.302-0.19l1.262-0.113l1.263,0.039l1.228,0.154l1.224,0.307l1.15,0.385l1.109,0.498l1.073,0.613l0.995,0.729l0.954,0.844l0.844,0.919l0.803,1.034L86.916,25l0.611,1.226l0.499,1.341l0.38,1.419l-0.46,0.035l-0.383,0.038
-			l-0.382,0.077l-0.384,0.077l-0.384,0.074l-0.382,0.078l-0.46,0.114l-0.496,0.076l-0.651-1.111l-0.613-1.073l-0.532-0.958l-0.5-0.956l-0.535-0.844l-0.498-0.804l-0.497-0.767l-0.572-0.69l-0.612-0.651l-0.688-0.575l-0.768-0.535l-0.842-0.498l-0.995-0.425
-			L75.7,19.286l-1.264-0.346l-1.415-0.308z"/>
-		<path style="&st11;" d="M66.933,19.432l1.914-0.457l1.8-0.268l1.646-0.075l1.531,0.154l1.417,0.307l1.302,0.461l1.187,0.573l1.074,0.77l1.03,0.842l0.917,0.96l0.844,1.034l0.802,1.112l0.728,1.147l0.688,1.227l0.612,1.226l0.611,1.265l-0.307,0.037l-0.42,0.037
-			l-0.459,0.115l-0.501,0.076l-0.496,0.115l-0.462,0.114l-0.419,0.036l-0.346,0.039l-0.571-1.148l-0.613-1.035L79.753,27.1l-0.726-0.918l-0.766-0.883l-0.805-0.806l-0.879-0.726l-0.919-0.69l-0.956-0.616l-0.996-0.573l-1.034-0.498l-1.07-0.498l-1.111-0.423
-			l-1.147-0.383l-1.189-0.346l-1.222-0.309z"/>
-		<path style="&st11;" d="M63.295,19.811l1.068-0.189l1.113-0.037l1.225,0.038l1.263,0.192l1.267,0.271l1.3,0.384l1.303,0.497l1.302,0.614l1.3,0.729l1.224,0.845l1.186,0.92l1.147,1.035l1.035,1.149l0.956,1.225l0.841,1.342l0.728,1.455l-0.537,0.039l-0.533,0.076
-			l-0.538,0.115l-0.536,0.113l-0.459,0.113l-0.385,0.117l-0.306,0.036l-0.19-0.037l-0.769-0.46l-0.763-0.537l-0.804-0.613l-0.843-0.689l-0.843-0.729l-0.878-0.768l-0.92-0.768l-0.916-0.802l-0.959-0.806l-0.956-0.807l-0.995-0.803l-0.996-0.729l-1.033-0.729
-			l-0.995-0.652l-1.071-0.613l-1.031-0.537z"/>
-		<path style="&st11;" d="M58.197,21.262l0.958-0.955l1.034-0.572l1.074-0.23l1.109,0.077l1.148,0.308l1.225,0.575l1.227,0.769l1.3,0.879l1.301,1.074l1.341,1.11l1.34,1.19l1.34,1.188l1.377,1.188l1.377,1.112l1.376,1.035l1.381,0.92l-0.421,0.074l-0.499,0.037
-			l-0.612,0.041l-0.613,0.037l-0.648,0.037h-0.653h-0.574l-0.497-0.002l-1.034-0.766l-0.993-0.804l-0.996-0.808l-0.918-0.842l-0.919-0.805l-0.883-0.807l-0.878-0.805l-0.88-0.767l-0.919-0.688l-0.879-0.651l-0.92-0.575l-0.956-0.5l-0.996-0.422l-1.034-0.345
-			l-1.073-0.192l-1.11-0.117z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd69" x1="-3772.377" y1="-3509.7163" x2="-3797.2949" y2="-3537.6816" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2070.8274 1900.0875)">
-				<stop  offset="0" style="stop-color:#4F0C81"/>
-				<stop  offset="0.0701" style="stop-color:#690C73"/>
-				<stop  offset="0.209" style="stop-color:#9A0A5B"/>
-				<stop  offset="0.3368" style="stop-color:#C20748"/>
-				<stop  offset="0.4512" style="stop-color:#E0053A"/>
-				<stop  offset="0.5481" style="stop-color:#F20032"/>
-				<stop  offset="0.6158" style="stop-color:#FA002F"/>
-				<stop  offset="1" style="stop-color:#F7EE5F"/>
-			</linearGradient>
-		</defs>
-		<path style="&st20;" d="M54.368,21.719l1.61-0.381l1.493-0.152l1.415,0.076l1.343,0.271l1.262,0.461l1.226,0.575l1.186,0.729l1.148,0.805l1.11,0.919l1.109,0.922l1.071,0.995l1.111,0.996l1.109,0.958l1.107,0.959l1.188,0.843l1.185,0.807l-0.38,0.037l-0.498,0.075
-			l-0.576,0.078l-0.576,0.036l-0.572,0.079l-0.5,0.072l-0.38,0.041l-0.231,0.037l-0.688-0.002l-0.69-0.189l-0.727-0.348l-0.766-0.496l-0.766-0.614l-0.843-0.728l-0.879-0.807l-0.919-0.844l-0.959-0.881l-1.031-0.918l-1.109-0.882l-1.148-0.844l-1.262-0.808
-			l-1.302-0.728l-1.379-0.651l-1.494-0.5z"/>
-		<path style="&st20;" d="M49.543,23.057l1.417-0.805l1.495-0.342h1.455l1.49,0.309l1.495,0.576l1.494,0.804l1.454,0.96l1.415,1.034l1.339,1.149l1.302,1.15l1.263,1.075l1.148,0.993l1.033,0.844l0.956,0.65l0.843,0.385l0.726,0.116l-0.61,0.077l-0.653,0.113
-			l-0.727,0.113l-0.765,0.117l-0.767,0.074l-0.767,0.115l-0.728,0.038L64.2,32.642l-1.07-0.806l-0.958-0.766l-0.879-0.767l-0.84-0.728l-0.767-0.73L58.96,28.12l-0.767-0.691l-0.726-0.651l-0.729-0.612l-0.804-0.576l-0.841-0.537l-0.919-0.496l-0.996-0.461
-			l-1.071-0.383l-1.226-0.348l-1.34-0.307z"/>
-		<defs>
-			<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd71" x1="-3498.5225" y1="4158.0396" x2="-3482.3647" y2="4209.6001" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 -1982.8965 3021.3838)">
-				<stop  offset="0" style="stop-color:#D8E7EB"/>
-				<stop  offset="0.0849" style="stop-color:#C9D9DE"/>
-				<stop  offset="0.2184" style="stop-color:#A5B8C2"/>
-				<stop  offset="0.3836" style="stop-color:#728896"/>
-				<stop  offset="0.5537" style="stop-color:#405766"/>
-				<stop  offset="0.6417" style="stop-color:#667D8B"/>
-				<stop  offset="0.742" style="stop-color:#92A7B1"/>
-				<stop  offset="0.8374" style="stop-color:#B7C8D0"/>
-				<stop  offset="0.9257" style="stop-color:#CFDFE4"/>
-				<stop  offset="1" style="stop-color:#D8E7EB"/>
-			</linearGradient>
-		</defs>
-		<g style="&st21;">
-			<defs>
-				<linearGradient gradientUnits="userSpaceOnUse"  id="AIgd72" x1="-3704.9473" y1="-3493.9082" x2="-3688.7896" y2="-3442.3477" gradientTransform="matrix(0.5318 0.0004 -0.0004 0.5318 2110.5286 1859.3658)">
-					<stop  offset="0" style="stop-color:#D8E7EB"/>
-					<stop  offset="0.0849" style="stop-color:#C9D9DE"/>
-					<stop  offset="0.2184" style="stop-color:#A5B8C2"/>
-					<stop  offset="0.3836" style="stop-color:#728896"/>
-					<stop  offset="0.5537" style="stop-color:#405766"/>
-					<stop  offset="0.6417" style="stop-color:#667D8B"/>
-					<stop  offset="0.742" style="stop-color:#92A7B1"/>
-					<stop  offset="0.8374" style="stop-color:#B7C8D0"/>
-					<stop  offset="0.9257" style="stop-color:#CFDFE4"/>
-					<stop  offset="1" style="stop-color:#D8E7EB"/>
-				</linearGradient>
-			</defs>
-			<path style="&st22;" d="M142.305,7.35l0.191-0.383l0.153-0.42l0.152-0.423l0.113-0.421l0.117-0.459l0.115-0.496l0.077-0.459l0.042-0.5l0.036-0.459l0.035-0.498l0.001-0.499l-0.035-0.46l-0.036-0.459l-0.08-0.457l-0.112-0.461l-0.114-0.42l0.611,0.804l0.459,0.882
-				l0.345,0.842l0.189,0.88l0.076,0.919v0.92l-0.116,0.918l-0.194,0.92l-0.228,0.918l-0.31,0.883l-0.343,0.879l-0.343,0.88l-0.385,0.843l-0.347,0.842l-0.346,0.765l-0.343,0.767l0.074-0.152l0.037-0.269l0.042-0.266v-0.345l0.037-0.424V12.06V11.6l0.001-0.496
-				l0.038-0.499v-0.498l0.039-0.534l0.04-0.498l0.038-0.461l0.078-0.461l0.075-0.42l0.116-0.383z"/>
-			<path style="&st22;" d="M153.974,23.252l-0.729-0.422l-0.729-0.462l-0.687-0.421l-0.688-0.422l-0.65-0.383l-0.651-0.422l-0.616-0.385l-0.609-0.42l-0.653-0.384l-0.607-0.384l-0.614-0.422l-0.652-0.382l-0.611-0.386l-0.654-0.342l-0.686-0.386l-0.689-0.382
-				l0.61,0.61l0.613,0.616l0.613,0.611l0.612,0.576l0.65,0.611l0.651,0.536l0.65,0.539l0.688,0.497l0.651,0.461l0.689,0.383l0.651,0.346l0.688,0.269l0.688,0.229l0.688,0.115l0.691,0.037l0.691-0.035z"/>
-			<path style="&st22;" d="M148.277,7.928l-0.536,0.308l-0.5,0.345l-0.495,0.345l-0.461,0.344l-0.46,0.343l-0.419,0.383l-0.424,0.421l-0.423,0.383l-0.384,0.422l-0.384,0.422l-0.382,0.421l-0.345,0.457l-0.383,0.422l-0.346,0.459l-0.344,0.459l-0.346,0.459
-				l0.153-0.496l0.192-0.499l0.191-0.537l0.229-0.534l0.231-0.536l0.265-0.499l0.31-0.498l0.346-0.495l0.382-0.46l0.461-0.381l0.498-0.385l0.537-0.344l0.612-0.269l0.652-0.229l0.765-0.152l0.805-0.076z"/>
-			<path style="&st22;" d="M142.574,3.329l-0.153,0.767l-0.114,0.767l-0.154,0.766l-0.116,0.689l-0.076,0.727l-0.114,0.689l-0.079,0.689l-0.115,0.689L141.576,9.8l-0.117,0.689l-0.074,0.651l-0.118,0.689l-0.116,0.689l-0.115,0.689l-0.15,0.689l-0.157,0.727
-				l-0.076-0.842l-0.113-0.805l-0.077-0.843l-0.076-0.841l-0.037-0.807l-0.038-0.805l0.039-0.805l0.039-0.764l0.076-0.767l0.116-0.688l0.194-0.689l0.229-0.651l0.269-0.573l0.384-0.537l0.422-0.46l0.497-0.421z"/>
-			<path style="&st22;" d="M146.674,2.071l0.692,0.648l0.416,0.729l0.189,0.766l0.04,0.805l-0.153,0.804l-0.307,0.843l-0.424,0.844l-0.498,0.841l-0.575,0.804l-0.611,0.805l-0.653,0.764l-0.65,0.689l-0.614,0.689l-0.534,0.572l-0.463,0.539l-0.383,0.418l0.077-1.147
-				l0.154-0.995l0.191-0.844l0.307-0.764l0.306-0.65l0.386-0.574l0.382-0.535l0.424-0.501l0.383-0.496l0.424-0.495l0.382-0.538l0.307-0.613l0.307-0.688l0.23-0.766l0.194-0.919l0.075-1.032z"/>
-			<path style="&st22;" d="M141.763,14.319v-0.805l-0.039-0.765l-0.034-0.765l-0.04-0.768l-0.036-0.729l-0.077-0.727l-0.076-0.727l-0.073-0.691l-0.117-0.688l-0.114-0.728l-0.189-0.689l-0.152-0.689L140.62,4.86l-0.268-0.689l-0.229-0.689l-0.306-0.689l1.111,1.073
-				l0.918,1.034l0.649,0.959l0.457,0.92l0.309,0.879l0.151,0.805l0.037,0.806l-0.077,0.727l-0.195,0.689l-0.187,0.651l-0.27,0.613l-0.271,0.533l-0.23,0.537l-0.229,0.459l-0.152,0.459l-0.078,0.383z"/>
-			<path style="&st22;" d="M152.982,16.97l-0.613,0.114l-0.614,0.116l-0.611,0.075l-0.613,0.075l-0.609,0.038l-0.616,0.037h-0.613h-0.575l-0.612-0.039h-0.574l-0.613-0.077l-0.573-0.038l-0.613-0.04l-0.575-0.075l-0.612-0.079l-0.574-0.075l0.498,0.229l0.498,0.192
-				l0.535,0.231l0.537,0.19l0.574,0.193l0.576,0.151l0.61,0.156l0.61,0.076l0.612,0.039h0.651l0.651-0.039l0.654-0.15l0.651-0.191l0.651-0.27l0.648-0.381l0.654-0.46z"/>
-			<path style="&st22;" d="M149.417,20.07l0.461,0.078l0.419,0.075l0.461,0.115l0.457,0.115l0.463,0.194l0.456,0.151l0.421,0.191l0.46,0.23l0.421,0.23l0.421,0.267l0.383,0.271l0.386,0.268l0.343,0.307l0.308,0.307l0.304,0.307l0.27,0.344l-0.269-0.917l-0.422-0.808
-				l-0.494-0.688l-0.615-0.651l-0.688-0.536l-0.768-0.5L151.754,19l-0.882-0.347l-0.919-0.306l-0.919-0.307l-0.955-0.231l-0.958-0.23l-0.957-0.193l-0.919-0.189l-0.843-0.154l-0.842-0.192l0.42,0.153l0.574,0.306l0.69,0.463l0.841,0.497l0.843,0.535l0.879,0.499
-				l0.842,0.46l0.768,0.308z"/>
-			<path style="&st22;" d="M151.174,26.926l0.345-0.881l0.117-0.844l-0.116-0.842l-0.307-0.766l-0.457-0.729l-0.612-0.727l-0.728-0.69l-0.804-0.614l-0.843-0.613l-0.879-0.536l-0.919-0.538l-0.884-0.459l-0.801-0.42l-0.767-0.387l-0.651-0.344l-0.496-0.309
-				l0.532,1.113l0.538,0.919l0.573,0.728l0.536,0.652l0.574,0.498l0.574,0.459l0.574,0.346l0.574,0.346l0.571,0.346l0.577,0.382l0.572,0.384l0.536,0.46l0.537,0.573l0.535,0.691l0.497,0.806l0.498,0.995z"/>
-			<path style="&st22;" d="M141.529,17.497l0.422,0.652l0.42,0.652l0.421,0.65l0.38,0.613l0.346,0.613l0.345,0.649l0.346,0.614l0.305,0.613l0.304,0.652l0.268,0.65l0.271,0.613l0.229,0.65l0.19,0.689l0.192,0.65l0.152,0.689l0.152,0.73l0.384-1.455l0.191-1.265
-				l0.041-1.149l-0.115-0.994l-0.229-0.844l-0.346-0.766l-0.42-0.652l-0.458-0.537l-0.538-0.499l-0.535-0.421l-0.573-0.346l-0.537-0.306l-0.496-0.306l-0.46-0.268l-0.342-0.307l-0.31-0.271z"/>
-		</g>
-	</g>
-</g><!-- Layer_x0020_1 -->
-</g><!-- translate and flip -->
-<g id="jakarta_text1" style='font-family: "Tahoma"; font-size: 15px; font-weight: bold;'>
-	<text x="114" y="15" fill="black" text-anchor="start">The</text>
-</g>
-<g id="jakarta_text2" style='font-family: "Tahoma"; font-size: 26px; font-weight: bold;'>
-	<text x="150" y="23" fill="black" text-anchor="start">Apache Avalon Project</text>
-</g>
-<g id="jakarta_text3" style='font-family: "Tahoma"; font-size: 16px;'>
-	<text x="190" y="44" fill="black" text-anchor="start">h t t p : / /  a v a l o n . a p a c h e . o r g /</text>
-</g>
-</svg>
diff --git a/site/src/site/oldimages/avalon-power.png b/site/src/site/oldimages/avalon-power.png
deleted file mode 100644
index 7a2133d..0000000
--- a/site/src/site/oldimages/avalon-power.png
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/deployment.gif b/site/src/site/oldimages/deployment.gif
deleted file mode 100644
index 782d350..0000000
--- a/site/src/site/oldimages/deployment.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/fedora-logo.png b/site/src/site/oldimages/fedora-logo.png
deleted file mode 100644
index c3d1738..0000000
--- a/site/src/site/oldimages/fedora-logo.png
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/group-logo.gif b/site/src/site/oldimages/group-logo.gif
deleted file mode 100644
index 57e4b36..0000000
--- a/site/src/site/oldimages/group-logo.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/jetspeed-logo.gif b/site/src/site/oldimages/jetspeed-logo.gif
deleted file mode 100644
index 0e56b60..0000000
--- a/site/src/site/oldimages/jetspeed-logo.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/merlin.gif b/site/src/site/oldimages/merlin.gif
deleted file mode 100644
index f1325cd..0000000
--- a/site/src/site/oldimages/merlin.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/project-logo.gif b/site/src/site/oldimages/project-logo.gif
deleted file mode 100644
index f2ebc6e..0000000
--- a/site/src/site/oldimages/project-logo.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/server-01.gif b/site/src/site/oldimages/server-01.gif
deleted file mode 100644
index 74ec58f..0000000
--- a/site/src/site/oldimages/server-01.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/server-02.gif b/site/src/site/oldimages/server-02.gif
deleted file mode 100644
index 911cfaf..0000000
--- a/site/src/site/oldimages/server-02.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/server-03.gif b/site/src/site/oldimages/server-03.gif
deleted file mode 100644
index 973c2a3..0000000
--- a/site/src/site/oldimages/server-03.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/server-04.gif b/site/src/site/oldimages/server-04.gif
deleted file mode 100644
index f906be2..0000000
--- a/site/src/site/oldimages/server-04.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/tortoisecvs-settings.jpg b/site/src/site/oldimages/tortoisecvs-settings.jpg
deleted file mode 100644
index f655a09..0000000
--- a/site/src/site/oldimages/tortoisecvs-settings.jpg
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/tortoisesvn-setting.jpg b/site/src/site/oldimages/tortoisesvn-setting.jpg
deleted file mode 100644
index f02834f..0000000
--- a/site/src/site/oldimages/tortoisesvn-setting.jpg
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/wincvs-checkout.jpg b/site/src/site/oldimages/wincvs-checkout.jpg
deleted file mode 100644
index 301fe30..0000000
--- a/site/src/site/oldimages/wincvs-checkout.jpg
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/wincvs-preferences.jpg b/site/src/site/oldimages/wincvs-preferences.jpg
deleted file mode 100644
index a8182c5..0000000
--- a/site/src/site/oldimages/wincvs-preferences.jpg
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldimages/wincvs-settings.jpg b/site/src/site/oldimages/wincvs-settings.jpg
deleted file mode 100644
index 18f2d7a..0000000
--- a/site/src/site/oldimages/wincvs-settings.jpg
+++ /dev/null
Binary files differ
diff --git a/site/src/site/oldxdocs/doc-template.xml b/site/src/site/oldxdocs/doc-template.xml
deleted file mode 100644
index 949c31a..0000000
--- a/site/src/site/oldxdocs/doc-template.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title></title>
-  </properties> 
-  
-  <body>
-    <section name="">
-
-      <subsection name="">
-        <p>
-        </p>
-        <p>
-        </p>
-      </subsection>
-
-      <subsection name="">
-        <p>
-        </p>
-        
-        <table>
-          <tr>
-            <th>Topic</th>
-            <th>Description</th>
-          </tr>
-        </table>
-      </subsection>
-
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/doc/articles.xml b/site/src/site/oldxdocs/doc/articles.xml
deleted file mode 100644
index 1b249a2..0000000
--- a/site/src/site/oldxdocs/doc/articles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Articles</title>
-  </properties> 
-
-  <body>
-    <section name="Directory Articles">
-     <p>
-       Some articals about various naming and directory topics.
-     </p>
-
-     <subsection name="General Documentation">
-      <ul>
-        <li>
-          Coming soon ...
-        </li>
-      </ul>
-     </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/doc/index.xml b/site/src/site/oldxdocs/doc/index.xml
deleted file mode 100644
index 2eabc9b..0000000
--- a/site/src/site/oldxdocs/doc/index.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Documentation</title>
-  </properties> 
-
-  <body>
-    <section name="Directory Documentation">
-     <p>
-       Coming soon ...
-     </p>
-     <table>
-       <tr>
-         <th>Resource</th>
-         <th>Description</th>
-       </tr>
-       <tr>
-         <td>
-            <a href="http://wiki.apache.org/directory">Wiki</a>
-         </td>
-         <td>
-          The Directory Wiki contains a growing collection of information
-          about roadmaps, development discussions, general ideas and other 
-          inspirational material.  Feel free to contribute!
-         </td>
-       </tr>
-     </table>
-
-     <subsection name="Articles">
-       <table>
-         <tr>
-           <th>Resource</th>
-           <th>Description</th>
-         </tr>
-         
-         <tr>
-           <td> 
-             Coming soon ...
-          </td>
-          <td>
-             Coming soon ...
-          </td>
-        </tr>
-
-       </table>
-     </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/doc/wiki.xml b/site/src/site/oldxdocs/doc/wiki.xml
deleted file mode 100644
index f676e3a..0000000
--- a/site/src/site/oldxdocs/doc/wiki.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Wiki</title>
-  </properties> 
-
-  <body>
-    <section name="Directory Wiki">
-      <p>The <a href="http://wiki.apache.org/directory">Directory Wiki</a> 
-        contains a growing collection of information about the Directory 
-        Project, roadmaps, development discussions, general ideas and other 
-        inspirational material.
-      </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/oldxdocs/irc.xml b/site/src/site/oldxdocs/irc.xml
deleted file mode 100644
index 1499bb7..0000000
--- a/site/src/site/oldxdocs/irc.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: IRC Channels</title>
-  </properties> 
-  
-  <body>
-
-    <section name="Directory IRC Channels">
-
-      <subsection name="WARNING: Channels are Logged!">
-        <p>
-          The perferred medium of communication is by email on the mailing lists
-          however we have two IRC channels we use to track live get togethers,
-          and conversations.
-        </p>
-        <p>
-          For the sake of history and tracking conversations we are logging both
-          channels and archiving them.  Please keep this in mind when conversing
-          on these lists.
-        </p>
-      </subsection>
-
-      <subsection name="Channels">
-        <p>
-          Right now we primarily use the dev channel for the team and basically
-          ask users to take their discussions there until a user community is
-          established.  The amount of chatter on both channels may be almost nil
-          until the community picks up.
-        </p>
-        
-        <table>
-          <tr>
-            <th>Channel</th>
-            <th>Purpose</th>
-            <th>Server</th>
-            <th>Archived</th>
-          </tr>
-          <tr>
-            <td>#directory</td>
-            <td>General and user chat</td>
-            <td>irc.freenode.net</td>
-            <td><a href="http://www.sol-earth.com/directory">Yes</a></td>
-          </tr>
-          <tr>
-            <td>#directory-dev</td>
-            <td>Developer babble</td>
-            <td>irc.freenode.net</td>
-            <td><a href="http://www.sol-earth.com/directory-dev">Yes</a></td>
-          </tr>
-        </table>
-      </subsection>
-
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/license.xml b/site/src/site/oldxdocs/license.xml
deleted file mode 100644
index babd5f7..0000000
--- a/site/src/site/oldxdocs/license.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory License</title>
-  </properties> 
-
-  <body>
-    <section name="Apache Directory Public License">
-     <source>
-
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-     </source>
-    </section>
-    
-    <section name="How to Apply License to Your Work">
-      <p>
-         To apply the Apache License to your work, attach the following
-         boilerplate notice, with the fields enclosed by brackets "[]"
-         replaced with your own identifying information. (Don't include
-         the brackets!)  The text should be enclosed in the appropriate
-         comment syntax for the file format. We also recommend that a
-         file or class name and description of purpose be included on the
-         same "printed page" as the copyright notice for easier
-         identification within third-party archives.
-      </p>
-      
-      
-      <source>
-Copyright [yyyy] [name of copyright owner]
-
-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.
-        
-      </source>
-      
-      <p>
-        For source file used with or for an ASF project, the following 
-        copyright notice can be used in the boilerplate
-      </p>
-      <source>
-        Copyright 2004 The Apache Software Foundation
-      </source>
-    </section>
-    
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/mailing-lists.xml b/site/src/site/oldxdocs/mailing-lists.xml
deleted file mode 100644
index 4ab44e5..0000000
--- a/site/src/site/oldxdocs/mailing-lists.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <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>
-</section>
-  <section name="The lists">
-    <subsection name="The Directory Developers and Users List">
-      <p>
-        All mail and concerns are managed via one list per incubator project. 
-        Although we left the incubator we're not discriminating between users and developers yet. 
-        As long a traffic is not extremely high, we will keep it as is.
-      </p>      
-      <p>
-	<em>Light Traffic</em>
-<a href="mailto:dev-subscribe@directory.apache.org">Subscribe</a>
-<a href="mailto:dev-unsubscribe@directory.apache.org">Unsubscribe</a>
-<a href="http://www.archivum.info/dev@directory.apache.org/">Archive</a>
-      </p>
-    </subsection>
-
-    <subsection name="The Directory SVN List">
-      <p>
-        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>
-      <p>
-	<em>Medium Traffic</em> 
-<a href="mailto:commits-subscribe@directory.apache.org">Subscribe</a>  
-<a href="mailto:commits-unsubscribe@directory.apache.org">Unsubscribe</a>  
-      </p>
-      <p>
-        Changes to the Directory Subversion repository are echoed to this list.
-      </p>
-    </subsection>
-</section>
-
-</body>
-
-</document>
diff --git a/site/src/site/oldxdocs/project-proposal.html b/site/src/site/oldxdocs/project-proposal.html
deleted file mode 100644
index 0ce2e9e..0000000
--- a/site/src/site/oldxdocs/project-proposal.html
+++ /dev/null
@@ -1,360 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0067)http://nagoya.apache.org/wiki/apachewiki.cgi?ApacheDirectoryProject -->
-<HTML><HEAD><TITLE>Apache Wiki: ApacheDirectoryProject</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1276" name=GENERATOR></HEAD>
-<BODY text=black vLink=purple link=blue bgColor=white>
-<H1><A href="http://nagoya.apache.org/wiki/apachewiki.cgi?HomePage"><IMG 
-alt=[Home] src="./images/asf_logo_wide.gif" border=0></A><A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?search=ApacheDirectoryProject">ApacheDirectoryProject</A></H1><A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?HomePage">HomePage</A> | <A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?RecentChanges">RecentChanges</A> 
-| <A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=editprefs">Preferences</A><BR>
-<HR>
-
-<H1>Proposal for an Apache Directory Project</H1><EM>10 Sept 2003, Alex Karasulu 
-(aok123@bellsouth.net) LDAPd Group Founder</EM> 
-<HR>
-
-<P>
-<P>
-<P><STRONG>Section 0 : Rationale</STRONG> 
-<P>The geometric growth of networks, services, distributed systems, and their 
-components has brought about a revival of interest in directories. Directories 
-are no longer considered commodity products used to store a phone book or list 
-of users. Directories and LDAP have grown into a critical technology that will 
-inevitably become a cornerstone of distributed systems. Several software giants 
-like BEA, SUN, and Microsoft have already demonstrated their belief in this 
-outcome by heavily integrating their products with directories. Directory and 
-naming systems are being used in everything from a simplified form for J2EE 
-configuration to full-blown enterprise directories, within identity management 
-systems and distributed computing platforms like JINI. 
-<P>
-<P>The overhead of managing several copies of relatively static information 
-across systems and enterprises is daunting and introduces the potential for data 
-inconsistency. The frequently replicated user and group tables in almost every 
-database driven application alone is a testament to this fact. When multiple 
-systems have to inter operate, they must share access to common information, and 
-directories are the best storage paradigm for rapidly accessing this type of 
-data. Whether the information to be stored, is a component's configuration, a 
-user's security profile, a business rule or a business process, directories are 
-the place to store it for centralized management, and distribution across 
-systems. 
-<P>To date, a fully compliant pure Java open source LDAPv3 server has not yet 
-been written. This is partially due to the fact that a practical stateful 
-protocol server in Java was virtually impossible until the introduction of the 
-NIO packages in the 1.4 SDK. LDAP, as a stateful protocol, manages client state 
-through a TCP socket connection. The socket connection persists through several 
-client requests and server responses tying them together under a logical session 
-or conversation. Before the introduction of non-blocking IO in the NIO packages 
-of the 1.4 SDK, a thread had to be dedicated to each socket to detect IO. A 
-stateful protocol server written completely in Java, would have needed as many 
-active threads as the number of concurrent clients. Theoretically, scalability 
-would have been very poor; the performance curve would be asymptotic, degrading 
-rapidly with an increase in the number of concurrent connections. To scale pure 
-Java statefull protocol server implementations had to wait until the Merlin 
-release of the JDK. 
-<P>Furthermore, no embeddable pure Java LDAPv3 server has yet been written and 
-made freely available. We believe the embedding of LDAP servers into existing 
-mail, application and web servers to be the next logical steps in the 
-progression and integration of LDAP. Several commercial examples can already be 
-sited: Microsoft Exchange and BEA Weblogic Server. The management benefits of 
-coupling these servers with an LDAP server are beyond the scope of this proposal 
-and left to the imagination of the reader. However, the synergy between embedded 
-LDAP servers and other flagship Apache servers would lead to greater economies 
-of scale for the Apache server suite and reduce the overhead of management for 
-the Apache software user community. 
-<P>LDAP directories are specialized databases, however unlike their RDBMS 
-counterparts, LDAP directories are fairly new and for this reason lack rich 
-integration features. High on the list of features lacking in LDAP servers are 
-stored procedures and triggers. Triggers and Java stored procedures would expand 
-the horizon of LDAP in itself even without the benefits of Java. Triggers and 
-stored procedures would alleviate ugly workarounds which currently using polling 
-and meta directories. These features alone would attract groups within the LDAP 
-and Java communities to band together and support the Apache LDAP Project. 
-<P>LDAP is both a network line protocol and a hierarchical relational database. 
-Some might even argue that LDAP is object oriented. Regardless, the 
-implementation of an LDAP server is not a trivial matter. LDAP code bases 
-written in native languages have to be ported to run on different platforms. 
-Conditional complies in C based implementations were shown to considerably 
-reduce the maintainability of code bases. The complexity of a database, a 
-network line protocol and conditional compilation together have resulted in 
-reduced maintainability for C based LDAP servers. Also the learning curve and 
-hence barrier to entry for developers is greater. These complications would not 
-exist for a Java based LDAP server that is written once and can run anywhere. 
-<P>The Apache Foundation supports several component container projects which 
-provide the proper foundation for a Java LDAP directory server. Apache also 
-supports several server side application containers which can realize 
-significant functional enhancements by employing an LDAP directory server. Also 
-LDAP requiring organizations today must settle for less than optimal 
-implementations and often have to pay as high as a dollar per entry to directory 
-enable their applications. The Apache LDAP Project would solve these problems by 
-providing a free robust LDAPv3 implementation in a standalone configuration or 
-an embeddable configuration for use in all Apache servers and other third party 
-products. 
-<P>Our goal is to produce a community of developers with backgrounds in LDAP, 
-X.500, Database Engineering and JNDI tasked with the development of pure Java 
-LDAPv3 Clients, APIs, JNDI providers and LDAPv3 compliant servers with the 
-aforementioned features. The produced software will be ASF licensed. Where 
-applicable the best available ASF/BSD licensed code will be reused and new code 
-will be added to complete the LDAPv3 protocol as defined in <A 
-href="http://www.ietf.org/rfc/rfc3377.txt">[RFC 3377]</A> and its associated 8 
-RFCs listed below: 
-<P>
-<UL>
-  <LI><A href="http://www.ietf.org/rfc/rfc2251.txt">[RFC2251]</A> Lightweight 
-  Directory Access Protocol (v3): LDAP on-the-wire protocol 
-  <LI><A href="http://www.ietf.org/rfc/rfc2252.txt">[RFC2252]</A> Lightweight 
-  Directory Access Protocol (v3): Attribute Syntax Definitions 
-  <LI><A href="http://www.ietf.org/rfc/rfc2253.txt">[RFC2253]</A> Lightweight 
-  Directory Access Protocol (v3): UTF-8 String Representation of DNs 
-  <LI><A href="http://www.ietf.org/rfc/rfc2254.txt">[RFC2254]</A> The String 
-  Representation of LDAP Search Filters 
-  <LI><A href="http://www.ietf.org/rfc/rfc2255.txt">[RFC2255]</A> The LDAP URL 
-  Format 
-  <LI><A href="http://www.ietf.org/rfc/rfc2256.txt">[RFC2256]</A> A Summary of 
-  the X.500(96) User Schema for use with LDAPv3 
-  <LI><A href="http://www.ietf.org/rfc/rfc2829.txt">[RFC2829]</A> Authentication 
-  Methods for LDAP 
-  <LI><A href="http://www.ietf.org/rfc/rfc2830.txt">[RFC2830]</A> Lightweight 
-  Directory Access Protocol (v3): Extension for Transport Layer Security 
-</LI></UL>
-<P>Additionally, the schema objects specified within the following RFCs will be 
-defined for use and partial or full complaince will be met where relavent to the 
-project: 
-<P>
-<UL>
-  <LI><A href="http://www.ietf.org/rfc/rfc1274.txt">[RFC1274]</A> The COSINE and 
-  Internet X.500 Schema 
-  <LI><A href="http://www.faqs.org/rfcs/rfc1804.html">[RFC1804]</A> Schema 
-  Publishing in X.500 Directory 
-  <LI><A href="http://www.ietf.org/rfc/rfc2079.txt">[RFC2079]</A> Definition of 
-  an X.500 Attribute Type and an Object Class to Hold Uniform Resource 
-  Identifiers (URIs) 
-  <LI><A href="http://www.ietf.org/rfc/rfc2247.txt">[RFC2247]</A> Using Domains 
-  in LDAP/X.500 Distinguished Names 
-  <LI><A href="http://www.ietf.org/rfc/rfc2293.txt">[RFC2293]</A> Representing 
-  Tables and Subtrees in the X.500 Directory 
-  <LI><A href="http://www.ietf.org/rfc/rfc2294.txt">[RFC2294]</A> Representing 
-  the O/R Address hierarchy in the X.500 Directory Information Tree 
-  <LI><A href="http://www.ietf.org/rfc/rfc2307.txt">[RFC2307]</A> An Approach 
-  for Using LDAP as a Network Information Service 
-  <LI><A href="http://www.ietf.org/rfc/rfc2377.txt">[RFC2377]</A> Naming Plan 
-  for Internet Directory-Enabled Applications 
-  <LI><A href="http://www.ietf.org/rfc/rfc2587.txt">[RFC2587]</A> Internet X.509 
-  Public Key Infrastructure LDAPv2 Schema 
-  <LI><A href="http://www.ietf.org/rfc/rfc2589.txt">[RFC2589]</A> Lightweight 
-  Directory Access Protocol (v3): Extensions for Dynamic Directory Services 
-  <LI><A href="http://www.ietf.org/rfc/rfc2596.txt">[RFC2596]</A> Use of 
-  Language Codes in LDAP 
-  <LI><A href="http://www.ietf.org/rfc/rfc2649.txt">[RFC2649]</A> An LDAP 
-  Control and Schema for Holding Operation Signatures 
-  <LI><A href="http://www.ietf.org/rfc/rfc2696.txt">[RFC2696]</A> LDAP Control 
-  Extension for Simple Paged Results Manipulation 
-  <LI><A href="http://www.ietf.org/rfc/rfc2713.txt">[RFC2713]</A> Schema for 
-  Representing Java(tm) Objects in an LDAP Directory 
-  <LI><A href="http://www.ietf.org/rfc/rfc2714.txt">[RFC2714]</A> Schema for 
-  Representing CORBA Object References in an LDAP Directory 
-  <LI><A href="http://www.ietf.org/rfc/rfc2798.txt">[RFC2798]</A> Definition of 
-  the inetOrgPerson<A 
-  href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=edit&amp;id=OrgPerson">?</A> 
-  LDAP Object Class 
-  <LI><A href="http://www.ietf.org/rfc/rfc2829.txt">[RFC2829]</A> Authentication 
-  Methods for LDAP 
-  <LI><A href="http://www.ietf.org/rfc/rfc2830.txt">[RFC2830]</A> Lightweight 
-  Directory Access Protocol (v3): Extension for Transport Layer Security 
-  <LI><A href="http://www.ietf.org/rfc/rfc2849.txt">[RFC2849]</A> The LDAP Data 
-  Interchange Format (LDIF) - Technical Specification 
-  <LI><A href="http://www.ietf.org/rfc/rfc2891.txt">[RFC2891]</A> LDAP Control 
-  Extension for Server Side Sorting of Search Results 
-  <LI><A href="http://www.ietf.org/rfc/rfc3045.txt">[RFC3045]</A> Storing Vendor 
-  Information in the LDAP root DSE 
-  <LI><A href="http://www.ietf.org/rfc/rfc3062.txt">[RFC3062]</A> LDAP Password 
-  Modify Extended Operation 
-  <LI><A href="http://www.ietf.org/rfc/rfc3088.txt">[RFC3088]</A> OpenLDAP<A 
-  href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=edit&amp;id=OpenLDAP">?</A> 
-  Root Service An experimental LDAP referral service 
-  <LI><A href="http://www.ietf.org/rfc/rfc3112.txt">[RFC3112]</A> LDAP 
-  Authentication Password Schema 
-  <LI><A href="http://www.ietf.org/rfc/rfc3296.txt">[RFC3296]</A> Named 
-  Subordinate References in Lightweight Directory Access Protocol (LDAP) 
-  Directories 
-  <LI><A href="http://www.ietf.org/rfc/rfc3383.txt">[RFC3383]</A> Internet 
-  Assigned Numbers Authority (IANA) considerations for the Lightweight Directory 
-  Access Protocol (LDAP) </LI></UL>
-<P>
-<P><STRONG>Section 0.1 : Criteria</STRONG> 
-<P>We feel that this project has a good chance for success as the following 
-project aspects are carefully considered : 
-<P><EM>Meritocracy:</EM> The project will be meritocratic - the usual Apache 
-meritocracy rules would apply. 
-<P><EM>Community:</EM> The user community for this project is potentially 
-massive. The initial developer community for this project consists of developers 
-from Apache and LDAPd projects. The aim is for this community to grow 
-considerably once this project enters the incubator. 
-<P><EM>Core Developers:</EM> The initial developers are listed further below 
-within this document and consist of some existing Apache committers together 
-with committers from the LDAPd Group. 
-<P><EM>Alignment:</EM> There is clear alignment with many existing Apache 
-projects. From Jakarta projects such as Tomcat, James and Slide for embedding 
-LDAP. The LDAP DSML standards will eventually require the use of several XML 
-projects. Other projects like OpenJms<A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=edit&amp;id=OpenJms">?</A>, 
-which currently are not Apache projects but very well may be in the future will 
-be used for things like replication. Jdbm likewise is used for building Btree 
-based indices for custom databases. Also projects like Apache Xindice may be 
-leveraged for an XML based backend or for DSML enabling subsystems of an LDAP 
-server. 
-<P>We see the Apache Directory Project as a separate project to existing Apache 
-projects, serving several roles 
-<UL>
-  <LI>Home for Apache Directory Client APIs and Client Scripts 
-  <LI>Home for Apache JNDI Providers for Various Directory Namespaces 
-  <LI>Home for Apache Directory Servers 
-  <LI>May also become home to an ASN.1 Encoding/Decoding<A 
-  href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=edit&amp;id=ApacheDirectoryProject/Decoding">?</A> 
-  Library </LI></UL>
-<P>
-<P><STRONG>Section 0.2 : Warning Signs</STRONG> 
-<P>We feel this project has a good chance for success as the following warning 
-signs do not apply to the project we are proposing: 
-<P><EM>Orphaned products:</EM> This project is starting with an existing code 
-base which using lots of the high quality open source code out there which is 
-ASF/BSD licensed. 
-<P><EM>Inexperience with open source:</EM> The initial community is made up of 
-existing Apache and LDAPd Group committers exclusively so the open source 
-experience is there to varying degrees. 
-<P><EM>Reliance on salaried developers:</EM> None of the initial developers are 
-currently paid to work on the Directory Project. 
-<P><EM>No ties to other Apache products:</EM> The Apache Directory Project is 
-complementary to existing technologies at Apache. LDAPd currently uses Avalon 
-and will eventually be used by james. LDAPd will eventually integrate into 
-Geronimo. The Apache Directory Project will integrate with, and possibly 
-subsume, Jakarta Commons Naming. 
-<P><EM>A fascination with the Apache brand:</EM> The committers are interested 
-in developing a healthy open source community around ASF/BSD licensed directory 
-servers and their clients along with other JNDI accessible name spaces. Is 
-Apache the right place? We think it is. Several Apache folks have already shown 
-interest in LDAPd, the seed code base to be used for this project. In fact the 
-LDAPd Group was initially approached by Apache to submit an Incubator proposal. 
-LDAPd Group members voted unanimously to donate the code to Apache in an effort 
-to build the next flagship server at Apache and much more. 
-<P>
-<P><STRONG>Section 1 : Scope of the Project</STRONG> 
-<P>There are multiple goals for this Apache project: 
-<P>
-<UL>
-  <LI>Promote a healthy open source community! 
-  <LI>Promote a language agnostic environment for both client side and server 
-  side endeavors. 
-  <LI>A one stop location for all directory and naming needs on any platform or 
-  any language. 
-  <UL>
-    <LI>client APIs 
-    <LI>clients 
-    <LI>JNDI providers for Java and other namespaces. 
-    <LI>May also include an LDAP protocol correctness and stress testing suite 
-    in the future. </LI></UL>
-  <LI>Provide servers in embeddable configurations. 
-  <LI>Provide servers in standalone configurations as UNIX daemons or NT 
-  Services. 
-  <LI>Provide support for Directory Server embedding or integration with 
-  existing Apache servers like httpd, Slide, Tomcat, James and Geronimo. 
-</LI></UL>
-<P>
-<P><STRONG>Section 2 : Initial Source</STRONG> 
-<P>The initial code base from which to create the Apache Directory repository is 
-contained mostly at Sourceforge under the LDAPd project accessible <A 
-href="http://sourceforge.net/projects/ldapd">[here]</A>. This code base must 
-assign copyright to the Apache Software Foundation. The code base will need to 
-be licensed under The Apache Software Foundation license. The license file in 
-every subproject will be changed to the Apache license. The current license is 
-already an Apache "style" license, so this change is basically a change to name 
-The ASF as the owner. 
-<P>The proposed TLP (after incubation) would have an one or more directory 
-servers with multiple datastore backends, a JNDI context for J2EE configuration, 
-JNDI service provider(s) for LDAP and other transports, State and Object 
-Factories suitable for use in the various Context/DirContext<A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=edit&amp;id=ApacheDirectoryProject/DirContext">?</A> 
-implementations, etc. 
-<P>Beside source code the LDAPd Group must transfer its IANA assigned ASN.1 
-Object Identifier to Apache Software Foundation. 
-<P><STRONG>Section 3 : ASF Resources to be Created</STRONG> 
-<P><EM>Section 3.1 : Mailing Lists</EM> 
-<P>
-<UL>
-  <LI>directory-dev@incubator.apache.org </LI></UL>
-<P><EM>Section 3.2 : CVS Repositories</EM> 
-<P>
-<UL>
-  <LI>incubator-directory </LI></UL>
-<P><EM>Section 3.3 : Bugzilla or (preferably) Jira</EM> 
-<P>
-<UL>
-  <LI>directory </LI></UL>
-<P>
-<P><STRONG>Section 4 : Initial Set of Committers</STRONG> 
-<P>All contributors must sign and submit a Contributors License Agreement. The 
-following individuals are the contributors, and have signed and sent the 
-agreement at one time or another: 
-<P>
-<UL>
-  <LI>Alex Karasulu 
-  <LI>Phil Steitz 
-  <LI>Robb Penoyer 
-  <LI>Noel Bergman 
-  <LI>Jeff Machols 
-  <LI>Henri Yandell 
-  <LI>Wes McKean<A 
-  href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=edit&amp;id=McKean">?</A> 
-  </LI></UL>
-<P>
-<P><STRONG>Section 5 : Apache Sponsoring Individuals</STRONG> 
-<P>
-<UL>
-  <LI>Nicola Ken Barozzi (Apache Incubator) 
-  <LI>Noel J. Bergman (Apache James) 
-  <LI>Henri Yandell (Jakarta Commons Naming) 
-  <LI>Stephen McConnell<A 
-  href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=edit&amp;id=McConnell">?</A> 
-  (Apache Avalon) 
-  <LI>James Strachan (Apache Geronimo) </LI></UL>
-<P>
-<P><STRONG>Section 6 : Incubation Exit Criteria</STRONG> 
-<P>We feel this project should exit the incubator to a TLP using the domain name 
-directory.apache.org should the following goals be met: 
-<P><EM>Technical Goals:</EM> 
-<P>
-<UL>
-  <LI>Clean status with Apaches Continuous Integration System 
-  <LI>Website cross reference to existing Apache literature with respect to 
-  rules and regulations 
-  <LI>At a minimum a beta release and/or a series of Release Candidates for a 
-  directory server and its clients. 
-  <LI>At least one server that complies with <A 
-  href="http://www.ietf.org/rfc/rfc2251.txt">[RFC2251]</A> </LI></UL>
-<P><EM>Non-Technical Goals:</EM> 
-<P>
-<UL>
-  <LI>List presence and monitoring in wider Apache communities 
-  <LI>Website cross reference to existing Apache literarature with respect to 
-  rules and regulations 
-  <LI>Initial integration plan and cooperation with Geronimo, and James 
-  <LI>Member presence on the licensing@apache list 
-  <LI>More Apache or non-Apache committers who are actively modifying source 
-  code </LI></UL>
-<HR>
-
-<FORM action=apachewiki.cgi method=post><A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?HomePage">HomePage</A> | <A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?RecentChanges">RecentChanges</A> 
-| <A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=editprefs">Preferences</A><BR><A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=edit&amp;id=ApacheDirectoryProject">Edit 
-text of this page</A> | <A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=history&amp;id=ApacheDirectoryProject">View 
-other revisions</A><BR>Last edited September 30, 2003 7:59 am <A 
-href="http://nagoya.apache.org/wiki/apachewiki.cgi?action=browse&amp;diff=1&amp;id=ApacheDirectoryProject">(diff)</A><BR>Search: 
-<INPUT name=search><INPUT type=hidden value=1 name=dosearch> 
-</FORM></BODY></HTML>
diff --git a/site/src/site/oldxdocs/related/apache.xml b/site/src/site/oldxdocs/related/apache.xml
deleted file mode 100644
index 9a39bec..0000000
--- a/site/src/site/oldxdocs/related/apache.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <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>
-        </table>
-      </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/related/external.xml b/site/src/site/oldxdocs/related/external.xml
deleted file mode 100644
index 00aeb99..0000000
--- a/site/src/site/oldxdocs/related/external.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Related External</title>
-  </properties> 
-
-  <body>
-    <section name="External 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>
-        </table>
-      </subsection>
-      
-      <subsection name="Projects Using Snickers">
-        <table>
-          <tr>
-            <th width="150">Name</th>
-            <th>Description</th>
-          </tr>
-        </table>
-      </subsection>
-      
-      <subsection name="Articles regarding Directory">
-        <table>
-          <tr>
-            <th width="150">Link</th>
-            <th>Description</th>
-          </tr>
-          <tr>
-            <td><a href="http://www.internetnews.com/dev-news/article.php/3463441">New Apache Directory Server Issued</a></td>
-            <td>Article on first release (0.8) of ApacheDS while in incubator</td>
-          </tr>
-        </table>
-      </subsection>
-      
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/oldxdocs/related/index.xml b/site/src/site/oldxdocs/related/index.xml
deleted file mode 100644
index 4b52052..0000000
--- a/site/src/site/oldxdocs/related/index.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <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 Directory code.
-        </td>
-	    </tr>
-	    
-	    <tr>
-	      <td><a href="external.html">External Projects</a></td>
-	      <td>
-	        A list of external projects based on Apache Directory technochnologies
-        </td>
-	    </tr>
-	    
-	    <tr>
-	      <td><a href="powered.html">Directory Powered</a></td>
-	      <td>Resources for the Directory Powered logo and site linking.<br/></td>
-	    </tr>
-	  </table>
-      </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/related/powered.xml b/site/src/site/oldxdocs/related/powered.xml
deleted file mode 100644
index 4bba900..0000000
--- a/site/src/site/oldxdocs/related/powered.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <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 Directory">
-      <p>
-        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="Directory Power"/>
-    </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/sandbox/index.xml b/site/src/site/oldxdocs/sandbox/index.xml
deleted file mode 100644
index 63bcf0c..0000000
--- a/site/src/site/oldxdocs/sandbox/index.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Sandbox</title>
-  </properties> 
-
-  <body>
-    <section name="Sandbox">
-     <p>
-       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>
-         <tr>
-	  <th>Project</th>
-	  <th>Description</th>
-	  <th>Developers</th>
-	 </tr>
-	 <tr>
-	  <td>abc123</td>
-	  <td>Just a place holder</td>
-	  <td>akarasulu</td>
-	 </tr>
-       </table>
-     </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/oldxdocs/svn.xml b/site/src/site/oldxdocs/svn.xml
deleted file mode 100644
index 76a8918..0000000
--- a/site/src/site/oldxdocs/svn.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Subversion</title>
-  </properties> 
-  <body>
-
-    <section name="About Subversion">
-      <p> Subversion is an open source version control system, released under 
-        an Apache/BSD-style license. This application was designed, and is on 
-        track to replace CVS. Users familiar with CVS will be able to jump into 
-        Subversion easily as most of the interface is the same. Details about 
-        the benefits and technical information can be viewed on the Subversion 
-        <a href="http://subversion.tigris.org/">home page</a>, here are just a 
-        few of the highlights: 
-        <ul> 
-          <li> Atomic Commits </li> 
-          <li> Versioned meta-data </li> 
-          <li> Revision numbers are per-commit, not per-file</li> 
-          <li> Uses Apache web server and WebDAV/DeltaV for network communication </li> 
-          <li> Enables binary diffs </li> 
-        </ul> 
-      </p>
-    </section> 
-    
-    <section name="Getting Help">     
-      <p> The subversion book is an excellent resource for users and 
-        administrators, it can obtained <a href= 
-        "http://svnbook.red-bean.com/html-chunk/">here</a>.
-      </p>
-    </section>
-    
-    <section name="Browsing the Repository">
-      <p>
-        You can browse the repository using ViewSVN <a href=
-       "http://svn.apache.org/viewcvs.cgi/directory/?root=Apache-SVN">
-        here</a>.
-      </p>
-    </section>
-    
-    <section name="Getting the sources from Subversion">
-      <p>
-        There's a few options for you.  Subversion can be run from
-        the command line (Linux or Windows) and there are also an 
-        increasing number of GUI's and plugin's.      
-      </p>
-  
-      <subsection name="Command-line tools">
-        <p>
-          The SVN utilities are available as native Windows, Linux, and solaris 
-          binaries. The source is also avaiable for other operating systems.  
-          The binaries and source can be obatined from the Subversion <a href="http://subversion.tigris.org/project_packages.html"> download 
-          page.</a>. 
-        </p>
-        
-        <p>To get the entire project, run the following command</p>
-        <source>
-          svn co https://svn.apache.org/repos/asf/directory
-        </source>
-      
-        <p>
-          This will take a while, depending on your connection. Go ahead and 
-          grab yourself a coffee or ten.  When done, you should have checked 
-          out all Directory sources. You will now need to install <a href=
-          "http://maven.apache.org/">Apache Maven</a>, our default build tool if 
-          you haven't already. 
-        </p>
-      </subsection>
-  
-      <subsection name="Use TortoiseSVN">
-        <p>
-          <a href="http://tortoisesvn.tigris.org/">TortoiseSVN</a> is a neat 
-          extension for the Windows Explorer which integrates SVN. Using it is 
-          real simple:
-        </p>
-  
-        <p>
-          After you've created a folder where you want to check out the sources 
-          to, right-click and select SVN Checkout.  Then, fill out the settings 
-          like in the screenshot below, and then click ok.<br/>
-          <img src="images/tortoisesvn-setting.jpg" alt="screenshot of SVN settings"/>
-        </p>
-      </subsection>    
-    </section>
-    
-    <section name="Commit with Subversion">   
-      <subsection name="Getting Access to Subversion">
-        <p>
-          Before you can commit to the subversion repository, you will
-          need to create an SVN password.  To do this, log on to 
-          minotaur.apache.org and run the following command:
-        </p>
-        <source>
-          svnpasswd 
-        </source>
-        <p>
-          The will ask you for a subversion password.  This is the user 
-          and password you will use when checking in code.  
-        </p>
-      </subsection>
-      <subsection name="Commit Code Via Command Line">
-        <p>
-          When you commit code to subversion, it will try to use the
-          username you are logged in as on the current system. If this 
-          is different than your subversion username, you will need to
-          specifiy this on the commit statement.  Subversion will prompt 
-          for your password when you run the command.  Note the is the 
-          SVN password, which is not the same as your minotaur password
-          This password can be entered as a command line argument to 
-          avoid interaction.  The follow command line will commit with a 
-          specified username and password:
-        </p>
-        <source>
-          svn commit --username <i>username</i> --password <i>password</i>
-        </source>
-      </subsection>
-      <subsection name="Commit with Tortoise">
-        <p>
-          To commit with TortoiseSVN, simply right click on the directory
-          you want to run the commit from and select commit.  A list of
-          files changed will be displayed with a text box for a log message.
-          At this point you can select which files should be committed and
-          enter you log text.  Select OK to start the commit, a dialog box
-          will appear prompting for username and password.  You will also
-          be able to select a check box to remember the credentials.  If you
-          select this check box, you will not be prompted for information in
-          the future
-        </p>
-      </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/resources/images/50k-ft-architecture.png b/site/src/site/resources/images/50k-ft-architecture.png
deleted file mode 100644
index 6bfb0e0..0000000
--- a/site/src/site/resources/images/50k-ft-architecture.png
+++ /dev/null
Binary files differ
diff --git a/site/src/site/resources/images/apache-directory-logo.png b/site/src/site/resources/images/apache-directory-logo.png
deleted file mode 100644
index d67b41b..0000000
--- a/site/src/site/resources/images/apache-directory-logo.png
+++ /dev/null
Binary files differ
diff --git a/site/src/site/resources/images/asf_logo_wide.gif b/site/src/site/resources/images/asf_logo_wide.gif
deleted file mode 100644
index b240328..0000000
--- a/site/src/site/resources/images/asf_logo_wide.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/resources/images/icon.png b/site/src/site/resources/images/icon.png
deleted file mode 100644
index 3be8bbb..0000000
--- a/site/src/site/resources/images/icon.png
+++ /dev/null
Binary files differ
diff --git a/site/src/site/resources/images/open-group.png b/site/src/site/resources/images/open-group.png
deleted file mode 100644
index 2a378c5..0000000
--- a/site/src/site/resources/images/open-group.png
+++ /dev/null
Binary files differ
diff --git a/site/src/site/resources/images/placid-systems-logo.png b/site/src/site/resources/images/placid-systems-logo.png
deleted file mode 100644
index 630b2b3..0000000
--- a/site/src/site/resources/images/placid-systems-logo.png
+++ /dev/null
Binary files differ
diff --git a/site/src/site/resources/images/szoerner_cover_ldap2_100x149.gif b/site/src/site/resources/images/szoerner_cover_ldap2_100x149.gif
deleted file mode 100644
index 00d8dd8..0000000
--- a/site/src/site/resources/images/szoerner_cover_ldap2_100x149.gif
+++ /dev/null
Binary files differ
diff --git a/site/src/site/site.xml b/site/src/site/site.xml
deleted file mode 100644
index 9ac32fc..0000000
--- a/site/src/site/site.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="Apache Directory Project">
-
-   <bannerLeft>
-     <name>Apache Diretory Project</name>
-     <src>images/apache-directory-logo.png</src>
-     <href>http://directory.apache.org/</href>
-   </bannerLeft>
-   <body>
-     <links>
-       <item name="ApacheDS" href="http://directory.apache.org/subprojects/apacheds/index.html"/>
-       <item name="Naming" href="http://directory.apache.org/subprojects/naming/index.html"/>
-       <item name="MINA (Network Layer)" href="http://directory.apache.org/subprojects/mina/index.html"/>
-       <item name="Directory" href="index.html"/>
-     </links>
-    <!--<menu name="About Directory">
-      <item name="Overview" href="/index.html"/>
-      <item name="Community" href="/community/index.html" collapse="true">
-        <item name="Who We Are" href="/community/who/index.html" collapse="true">
-          <item name="Wes McKean" href="/community/who/wesmckean.html"/>
-          <item name="Jeff Machols" href="/community/who/jmachols.html"/>
-          <item name="Alex Karasulu" href="/community/who/akarasulu.html"/>
-          <item name="Noel J. Bergman" href="/community/who/noel.html"/>
-          <item name="Stephen McConnell" href="/community/who/mcconnell.html"/>
-          <item name="Phil Steitz" href="/community/who/psteitz.html"/>
-          <item name="Vincent Tence" href="/community/who/vtence.html"/>
-          <item name="Enrique Rodriguez" href="/community/who/erodriguez.html"/>
-          <item name="Trustin Lee" href="/community/who/trustin.html"/>
-          <item name="Ersin Er" href="/community/who/ersiner.html"/>
-          <item name="Stefan Zoerner" href="/community/who/szoerner.html"/>
-          <item name="Emmanuel Lecharny" href="/community/who/elecharny.html"/>
-        </item>
-        <item name="Process" href="/community/process/index.html" collapse="true">
-          <item name="Management Committee" href="/community/process/pmc.html"/>
-          <item name="PMC Procedures" href="/community/process/pmc-votes.html"/>
-          <item name="Coding Standards" 
-            href="/community/process/code-standards.html"/>
-          <item name="Release Management" 
-            href="/community/process/release.html"/>
-          <item name="Patches and Bugs" 
-            href="/community/process/patches.html"/>
-        </item>
-        <item name="History" href="/community/history/index.html" collapse="true">
-          <item name="Java and LDAP" href="/community/history/java-ldap.html"/>
-          <item name="The LDAPd Group" 
-            href="/community/history/ldapd-group.html"/>
-          <item name="Naming Commons" 
-            href="/community/history/naming-commons.html"/>
-        </item>
-      </item>      
-       <item name="Documentation" href="/doc/index.html" collapse="true">
-        <item name="Wiki" href="/doc/wiki.html"/>
-        <item name="Articles" href="/doc/articles.html"/>
-      </item>
-    </menu> -->
-
-   <menu name="Project Categories">
-     <item name="ApacheDS" href="subprojects/apacheds/index.html"/>
-     <item name="Naming" href="subprojects/naming/index.html"/>
-     <item name="MINA (Network Layer)" href="subprojects/mina/index.html" />
-   </menu>
-<!--
-    <menu name="Resources">
-      <item name="IRC" href="/irc.html"/>
-      <item name="Jira" href=
-        "http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10400"/>
-      <item name="Wiki" href="http://wiki.apache.org/directory"/>
-      <item name="Lists" href="/mailing-lists.html"/>
-      <item name="License" href="/license.html"/>
-      <item name="Downloads" href="http://cvs.apache.org/dist/directory"/>
-      <item name="Subversion" href="/svn.html"/>
-    </menu>-->
-    <!-- Commented out (menu entry still useful as a placeholder for the next event)
-    <menu name="ApacheCon US 2005"> 	 
-      <item name="ApacheCon US 2005" href="http://www.apachecon.com/"
-            img="http://apache.org/images/ac2005us_blue_125x125.jpg" />
-    </menu>
-    -->
-    ${reports}
-    <menu name="">
-      <item name="Others Using Directory Software" href="others.html"/>
-      <item name="Special Thanks" href="thanks.html"/>
-      <item name="Downloads" href="http://www.apache.org/dyn/closer.cgi/directory/"/>
-    </menu>
- </body>
-</project>
diff --git a/site/src/site/xdoc/community/history/index.xml b/site/src/site/xdoc/community/history/index.xml
deleted file mode 100644
index ab9be76..0000000
--- a/site/src/site/xdoc/community/history/index.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Community History</title>
-  </properties>
-
-<body>
-
-<section name="History">
-
-<p>
-    This document tracks the history of the Directory project. The
-    Directory project was originally started with the need for a
-    Java LDAP Server.  Explain more history.
-</p>
-
-<p>
-    Over time the Java ...
-</p>
-</section>
-
-</body>
-</document>
diff --git a/site/src/site/xdoc/community/history/java-ldap.xml b/site/src/site/xdoc/community/history/java-ldap.xml
deleted file mode 100644
index a378169..0000000
--- a/site/src/site/xdoc/community/history/java-ldap.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: History of Java and LDAP</title>
-  </properties>
-
-  <body>
-    <section name="History of Java and LDAP">
-      <p>
-        Coming soon ...
-      </p>
-    </section>
-  </body>
-</document>
- 
\ No newline at end of file
diff --git a/site/src/site/xdoc/community/history/ldapd-group.xml b/site/src/site/xdoc/community/history/ldapd-group.xml
deleted file mode 100644
index 90819fc..0000000
--- a/site/src/site/xdoc/community/history/ldapd-group.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: History of the LDAPd Group</title>
-  </properties>
-
-  <body>
-    <section name="History of the LDAPd Group">
-      <p>
-        Coming soon ...
-      </p>
-    </section>
-  </body>
-</document>
- 
\ No newline at end of file
diff --git a/site/src/site/xdoc/community/history/naming-commons.xml b/site/src/site/xdoc/community/history/naming-commons.xml
deleted file mode 100644
index a60ccd6..0000000
--- a/site/src/site/xdoc/community/history/naming-commons.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: History of Naming Commons</title>
-  </properties>
-
-  <body>
-    <section name="History of Naming Commons">
-      <p>
-        Coming soon ...
-      </p>
-    </section>
-  </body>
-</document>
- 
\ No newline at end of file
diff --git a/site/src/site/xdoc/community/index.xml b/site/src/site/xdoc/community/index.xml
deleted file mode 100644
index 3bbf29f..0000000
--- a/site/src/site/xdoc/community/index.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory: Community</title>
-  </properties>
-
-  <body>
-    <section name="The Directory Community">
-      <subsection name="Index">
-        <table>
-          <tr><th>Topic</th><th>Description</th></tr>
-          <tr>
-            <td><a href="who/index.html">Who We Are</a></td>
-            <td>
-              <p>
-      These pages list many of the contributors to directory. They
-      have worked and are working long and hard to make quality
-      software for the rest of the world to use.  Contributors to the
-      Directory Project should be extremely proud of themselves!  If you
-      would like to become a contributor, please see the Get Involved
-      document to figure out how. If you are a contributor but are not
-      listed, submit a patch!
-              </p>
-            </td>
-          </tr>
-          <tr>
-            <td><a href="process/index.html">Process</a></td>
-            <td>
-              <p>
-      The Apache Directory Project, like all other projects at Apache, is a
-      <em>meritocracy</em> and follows the <em>Apache Way</em> of
-      community and project management.  This page contains a bunch of 
-      references to the structure, operation and process aspects that
-      help us maintain project oversight.
-              </p>
-            </td>
-          </tr>
-          <tr>
-            <td><a href="history/index.html">Historical</a></td>
-            <td><p>Background content - how Apache Directory came to be.<br/></p></td>
-          </tr>
-        </table>
-      </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/community/process/code-standards.xml b/site/src/site/xdoc/community/process/code-standards.xml
deleted file mode 100644
index f8d4604..0000000
--- a/site/src/site/xdoc/community/process/code-standards.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Coding Standards</title>
-  </properties> 
-<body>
-<section name="Coding Standards">
- <p>This document describes a list of coding conventions that are required
- for code submissions to the project. By default, the coding conventions
- for most Open Source projects should follow the existing coding conventions
- in the code that you are working on. For example, if the bracket is on
- the same line as the if statement, then you should write all your code
- to follow that convention.</p>
-
-<p><strong>Please follow these conventions closely. It makes life so much
-easier.</strong></p>
-
-<p>Brackets should begin and end on a new line. Examples:</p>
-<source>
-
-if( foo )
-{
-    // code here
-}
-
-try
-{
-    // code here
-}
-catch( final Exception bar )
-{
-    // code here
-}
-finally
-{
-    // code here
-}
-
-while( true )
-{
-    // code here
-}
-
-</source>
-
-<p>The preference is to include extra spaces between parenthesis and expression.
-For example;
-</p>
-<source>
-
-if( foo )
-
-</source>
-<p>4 spaces. <strong>NO</strong> tabs. Period. We understand that a lot of you like
-to use tabs, but the fact of the matter is that in a distributed development
-environment, when the cvs commit messages get sent to a mailing list, they
-are almost impossible to read if you use tabs.</p>
-
-<p>In Emacs-speak, this translates to the following command:</p>
-
-<source>(setq-default tab-width 4 indent-tabs-mode nil)</source>
-
-<p>In vim, having the following in your .vimrc will help:</p>
-<source>
-set tabstop=4
-set expandtab
-set list
-set listchars=tab:&gt;.
-</source>
-
-<p>Unix linefeeds for all .java source code files. Other platform specific
-files should have the platform specific linefeeds.</p>
-
-<p>Javadoc <strong>SHOULD</strong> exist on all your methods. Also, if you are working
-on existing code and there currently isn't a javadoc for that method/class/variable
-or whatever, then you should contribute and add it. This will improve the
-project as a whole.</p>
-
-<p>The Jakarta Apache/Directory License <strong>MUST</strong> be placed at the 
-  top of each and every file.</p>
-
-<p>If you contribute to a file (code or documentation), add the following author tag to the
-top of the file. For .java files the preferred Javadoc format is:</p>
-
-<source>
-@author &lt;a href="mailto:dev@directory.apache.org"&gt;Apache Directory Project&lt;/a&gt;
-</source>
-
- <p>Indent comments on an 80 column basis and the code on a
- 100 column basis, using two more indents when a line must be wrapped.</p>
-
-<p>We focus on readability over performance, at least initially. Source code
-optimization is the last thing to be done to increase performance.
-If the code is not performing then it is better to re-engineer it rather
-than to expand loops, take out variable declarations etc. When the code
-is stable and has a well defined purpose and interface it may be appropriate
-to do source code optimization.</p>
-
-<p>Try to javadoc all methods and variables, especially public, protected
-and default access methods and member variables. Also add code comments
-when you think it's necessary (like assumptions).</p>
-
-<p>Variables are declared in the inner scope.</p>
-
-<source>
-while( myListIterator.hasNext() )
-{
-    final String myString = (String)myListIterator.next();
-}
-</source>
-
-<p>Variables should be descriptive and ideally English words. The exceptions
-being loop counters (usually use i, j and k), exceptions (use concatenation
-of word separating characters - i.e. SocketException is abbreviated as se) and
-other commonly used abbreviations (i.e. sb for StringBuffer).</p>
-<source>
-try
-{
-    for( int i = 0; i &lt; 10; i++ )
-    {
-        // some stuff
-    }
-}
-catch( final FileNotFoundException fnfe )
-{
-    // some stuff
-}
-catch( final IndexOutOfBoundsException ioobe )
-{
-    // some stuff
-}
-</source>
-<p>
-Use String concatenation except in extremely performance sensitive
-sections. This leaves StringBuffer optimization to the compiler.
-So use:</p>
-<source>
-final String myString = "test " + "for " + "performances";
-</source>
-<p>Try not to declare a method as 'synchronized'.  If a method accesses
-a shared resource then surround accesses to that resource with
-a synchronized block. Ideally the synchronized block should surround
-the smallest possible area. For example:</p>
-<source>
-public void sharedMethod()
-{
-    String display = null;
-
-    synchronized( this )
-    {
-        display = mySharedObject.getHelloWorld();
-    }
-
-    System.out.println( display );
-}
-</source>
-<p>If you are within a static method, then you may have to create
-a static object whose sole purpose in life is to provide the
-lock you need. Alternatively you could use the Class object for
-the class you are in. That is, if you're in class MyClass, use
-"MyClass.class".</p>
-<p>Have the names of all member instance fields start with the prefix "m_".
-Example:</p>
-
-<source>
-class MyClass
-{
-    Class m_class = MyClass.class;
-    int m_users;
-}
-</source>
-
-<p>Don't chain method calls. The below:</p>
-<source>
-Thing thing = (MyThing)myObject.doSomething().doSomethingElse().getMyThing();
-</source>
-<p>is considered bad practice because it hides problems relating to
-synchronization, resource management, etc. The example above might
-become:</p>
-<source>
-final MySomething something = myObject.doSomething();
-final MyElse somethingElse = something.doSomethingElse();
-Thing thing = somethingElse.getMyThing();
-</source>
-<p>The extra typing will help keep the code bug-free.</p>
-
-<p>Thanks for your cooperation.</p>
-
-<p>-The Directory Project Team</p>
-
-</section>
-
-</body>
-</document>
diff --git a/site/src/site/xdoc/community/process/development.xml b/site/src/site/xdoc/community/process/development.xml
deleted file mode 100644
index b12760e..0000000
--- a/site/src/site/xdoc/community/process/development.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project</title>
-  </properties> 
-
-  <body>
-    <section name="Directory Development Process">
-     <p>
-       The following documents describe the development practices in
-       use by the Directory community.  When contributing to the project,
-       please follow these guidelines.
-     </p>
-     <ul>
-       <li><a href="code-standards.html">Coding Standards</a></li>
-       <li><a href="release.html">Release Guidelines</a></li>
-       <li><a href="patches.html">Patch Policies</a></li>
-     </ul>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/community/process/index.xml b/site/src/site/xdoc/community/process/index.xml
deleted file mode 100644
index efbb4eb..0000000
--- a/site/src/site/xdoc/community/process/index.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Process</title>
-  </properties>
-
-  <body>
-    <section name="The Directory Community">
-     <p>
-      Welcome to the Directory community!
-     </p>
-     <p>
-      The Apache Directory Project, like all other projects at Apache, 
-      is a <em>meritocracy</em> and follows the <em>Apache Way</em> of
-      community and project management.  The following documents
-      help define these terms and form the guidelines by which the 
-      Directory Project operates.
-     </p>
-     <ul>
-       <li><a href="http://jakarta.apache.org/site/decisions.html">
-         Meritocracy</a></li>
-       <li><a
-         href="http://nagoya.apache.org/wiki/apachewiki.cgi?ApacheWay">
-	 The Apache Way</a></li>
-       <li><a href="http://jakarta.apache.org/site/roles.html">Roles
-         and Responsibilities</a></li>
-       <li><a href="http://jakarta.apache.org/site/guidelines.html">
-         Jakarta Project Guidelines</a></li>
-       <li><a href="http://incubator.apache.org/index.html">
-         The Apache Incubator Project</a></li>
-       <li><a href="http://apache.org/foundation/">The Apache Software
-         Foundation</a> (ASF)</li>
-       <li><a
-     href="http://www.apache.org/licenses/cla.pdf">
-         Contributor license Agreement</a> [PDF]</li>
-       <li><a href="http://james.apache.org/contribute.html">Getting Involved</a></li>
-     </ul>
-    </section>
-    <section name="Opening up the Directory Project's Repositories">
-      <p>
-        The Directory Project continually looks at ways to cooperate 
-        better with other projects, especially here at Apache.
-        Code reuse by us and others using our APIs is one of our
-        primary goals.
-      </p>
-      <p>
-       If you are from another Apache project, and would like all the
-       committers from your project to have access to the Directory
-       Repositories, all you need to do is ask the Directory PMC
-      </p>
-       <p>
-         The PMC will let you know if your request is accepted or
-         not. If you are interested in commit privileges, but are not
-         part of one of the Apache projects, then you have to do it
-         the old fashioned way and participate on the mailing lists
-         and post patches, etc. We are taking advantage of the Apache
-         infrastructure to make this happen.
-       </p>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/community/process/mission.xml b/site/src/site/xdoc/community/process/mission.xml
deleted file mode 100644
index c9ee537..0000000
--- a/site/src/site/xdoc/community/process/mission.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Mission</title>
-  </properties> 
-
-  <body>
-    <section name="Apache Directory Project Mission">
-    <source>
-Apache Directory is a collaborative software development project dedicated
-to providing a high-quality freely available set of directory servers and
-APIs used for accessing naming and directory systems via JNDI 
-according to the principles of the Apache Software Foundation [ASF].
-
-This charter briefly describes the mission, history, organization, and
-processes of the Apache Directory project.
-
-MISSION
-=======
-
-    </source>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/community/process/patches.xml b/site/src/site/xdoc/community/process/patches.xml
deleted file mode 100644
index e9344d5..0000000
--- a/site/src/site/xdoc/community/process/patches.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Patches</title>
-  </properties> 
-       <body>
-	  <section name="JIRA">
-	    <p>It's the issue tracking system we use, and
-	    we ask that you do, too.<br/>
-	    <br/>
-	    <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10400"><strong>Enter a bug</strong></a><br/>
-	    <br/>
-	    but please make sure the bug you're reporting doesn't exist yet, you include
-	    all relevant information, etc. See
-	    <a href="http://nagoya.apache.org/wiki/apachewiki.cgi?HowDoISubmitUsefulBugReports">this page</a>
-	    for more on how to submit bug reports, or try Google.</p>
-	  </section>
-	  <section name="Submitting patches">
-	    <p>Generate patches using <code>cvs diff -u</code>, or <code>diff -u</code>.
-	    Please create your patches relative to the root of the cvs module the patch
-	    should be applied to. Please compile changes to multiple files
-	    in a single patch file. Make sure the patch adheres to the coding standards,
-	    and includes appropriate javadoc.</p>
-	    
-	    <p>When you've built the patch, file a new bug report in JIRA if one
-	    does not exist yet, explain the reason behind the patch, how the patch fixes
-	    the issues, and add the patch as an attachment.</p>
-	    
-	    <p>If your patch is not getting applied or there is no response, start nagging
-	    the developers (politely, please :D) on the developers mailing list.</p>
-	    
-	    <section name="Documentation patches">
-	      <p>Please submit documentation patches against the xml sourcefiles used
-	      for generating the documentation, and not against the documentation
-	      itself.</p>
-	    </section>
-	  </section>
-        </body>
-
-</document>
diff --git a/site/src/site/xdoc/community/process/pmc-votes.xml b/site/src/site/xdoc/community/process/pmc-votes.xml
deleted file mode 100644
index 3083a3f..0000000
--- a/site/src/site/xdoc/community/process/pmc-votes.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: PMC Voting</title>
-  </properties> 
-
-
-    <body> 
-        <section name="Voting Procedures">
-            
-            <p>This document details how the Directory PMC has agreed to handle 
-              voting.</p>
-            
-            <subsection name="People Involved in the Voting Process">
-                
-                <subsection name="The Proposer">
-                    
-                    <p>
-                     The proposer is the one who comes up with the
-                        discussion that needs to be addressed.  Any
-                        member of the Directory community may start the
-                        discussion. The proposer must follow the
-                        procedures listed under the heading "Prior to
-                        the Vote".</p>
-                    
-                </subsection>
-                
-                <subsection name="The Vote Administrator">
-                    
-                    <p>The vote administrator is the person who
-                        tallies the votes and reports the results.
-                        The person who actually puts a proposal up for
-                        vote is usually the vote administrator,
-                        although this task can be taken on by someone
-                        else.</p>
-                    
-                </subsection>
-                
-                <subsection name="The Voter">
-                    
-                    <p>A voter is someone who expresses support,
-                        opposition or abstention for the subject being
-                        voted on.  A voter must be a Directory PMC
-                        member. Input is appreciated from committers
-                        and all other members of the community, but
-                        only votes from PMC members are counted.</p>
-                    
-                </subsection>
-            </subsection>
-            
-            <subsection name="Prior to the Vote">
-                
-                <p>Before any vote can take place, the subject must be
-                    discussed. All such discussions take place on the
-                    Directory developer or PMC mailing list, and have the
-                    text "[PROPOSAL]" in the subject line.  That
-                    practice alerts members to the fact that you
-                    eventually intend to call a vote on the
-                    subject.</p>
-                
-            </subsection>
-            <subsection name="The Vote">
-                
-                <p>When the proposal is ready to be adopted by the
-                    community, the Proposer will call for a vote on
-                    the Directory developers or PMC mailing list. The
-                    call for vote must have the text "[PMC:VOTE]" in
-                    the subject line.  That practice alerts the
-                    members to the fact that the prior proposal is now
-                    ready to vote on, and discussion should stop for
-                    the proposal.</p>
-                
-                <subsection name="How to Vote">
-                    
-                    <p>The voter responds to the call for vote with an
-                        expression of support, opposition, or
-                        abstention.  The exact way to express the
-                        voter's position is listed below:</p>
-                    
-                    <ul>
-                        <li>+1  a vote supporting the subject</li>
-                        <li>+0  a vote abstaining from the subject (but showing some support).</li>
-                        <li> 0  a vote abstaining from the subject.</li>
-                        <li>-0  a vote abstaining from the subject (but showing disapproval).</li>
-                        <li>-1  a vote opposing the subject</li>
-                    </ul>
-                </subsection>
-                
-                <subsection name="Counting Votes">
-                    
-                    <p>The vote administrator will count only the last
-                        vote from each voter.  That means a voter may
-                        change their vote at any time during the
-                        duration of the vote. All votes (+1, -1, +0,
-                        -0 and 0) count toward quorum, but +0, -0 and
-                        0 do not count when determining majority.</p>
-                        </subsection>
-                
-                <subsection name="Types of Votes">
-                    
-                    <p>There are two classes of votes: a Qualified
-                        Majority Vote and a Normal Majority Vote. In
-                        both types of votes, only +1 and -1 votes
-                        count toward majority.</p>
-                    
-                    <subsection name="Qualified Majority Vote">
-                        
-                        <p>Any vote that affects the texts "Directory PMC
-                            Charter" or "Directory PMC Policies and
-                            Procedures" is a Qualified Majority
-                            Vote. For this type of vote to pass, it
-                            requires that there are more than twice as
-                            many +1 votes as -1 votes.</p> </subsection>
-                    
-                    <subsection name="Normal Majority Vote">
-                        
-                        <p>All votes that do not fall under the
-                            heading of Qualified Majority Vote are
-                            handled as a Normal Majority Vote. If
-                            there are more +1 votes than -1 votes,
-                            then the vote has passed.</p> </subsection>
-                            </subsection>
-                
-                <subsection name="Voting Qualifications">
-                    
-                    <p>In order for any vote to be considered binding
-                        it must have quorum, and be held for the
-                        proper amount of time.</p>
-                    
-                </subsection>
-                
-                <subsection name="Quorum">
-                    
-                    <p>For all votes, there must be at least three (3)
-                        voters and half (1/2) of the PMC must cast a
-                        vote. When determining quorum, all votes (+1,
-                        -1, +0, -0 and 0) count.</p> </subsection>
-                
-                <subsection name="Duration">
-                    
-                    <p>All votes will be open for an initial period of
-                        one week.  The Vote Administrator may close
-                        the vote at any time after that period if
-                        quorum has been achieved.  If quorum could not
-                        be reached within the initial one-week period,
-                        the vote will remain open for one additional
-                        week.  If the vote still has not achieved
-                        quorum, then it is considered failed.  The
-                        proposer can choose to bring it up later when
-                        quorum can be reached.</p> </subsection>
-                        </subsection>
-            
-            <subsection name="After the Vote">
-                
-                <p>When the vote is closed, the results of the vote
-                    are summarized by the Vote Administrator.  The
-                    vote administrator will send an email to the
-                    Directory developers or PMC list with the text
-                    "[PMC:VOTE-RESULT]" in the subject that has the
-                    summary.  The summary will include the count of
-                    all +1, +0, 0, -0, and -1 responses, and the final
-                    verdict of whether the subject passed.</p>
-                    </subsection>
-            
-            <subsection name="Disagreements">
-                
-                <p>Disagreements concerning voting may be directed to
-                    the Chair. The Chair's opinion shall be final and
-                    binding upon the PMC.</p>
-                
-            </subsection>
-        </section>
-    </body>
-</document>
diff --git a/site/src/site/xdoc/community/process/pmc.xml b/site/src/site/xdoc/community/process/pmc.xml
deleted file mode 100644
index 03dd65f..0000000
--- a/site/src/site/xdoc/community/process/pmc.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: PMC</title>
-  </properties> 
-
-  <body>
-    <section name="">
-      <p>
-        For now because we are within the incubator we do not have a PMC but 
-        the incubator's equivalent of one for a incubated project.  Until we
-        exit the incubator the this PPMC will operate using the PMC guidelines
-        below.
-      </p>
-    </section>
-    
-	  <section name="Informative material only">
-	    <p>These pages exist only to provide some down-to-earth insight
-	    in how things work at the ASF. They're informative only, not
-	    normative. They may contain errors or inadequacies. IANAL.</p>
-	  </section>
-          <section name="So what is this PMC thing?">
-            <p>Apache is a legal entity, i.e. a real non-profit organisation,
-	    with a charter, members, a board, a president, etc. You can
-	    read all about that
-	    <a href="http://www.apache.org/foundation/">here</a></p>
-	    
-	    <p>A PMC, Project Management Committee, is a group of people
-	    appointed with the task of managing something that fits with the
-	    Apache Software Foundation goals. The Directory PMC, for example,
-	    is tasked with managing the Apache Directory Project.</p>
-	  </section>
-	  <section name="What, management?! We've already got plenty of those at work!">
-	    <p>We're all programmers, and that is what we want to occupy us
-	    with. We like to share and work on our software together, which
-	    is why we make it free software. However, there is always some
-	    stuff which still requires management.</p>
-	    
-	    <p>For example, in order to protect ourselves and our users, all
-	    software hosted at Apache must be properly copyrighted to the ASF,
-	    and licensed under the ASF license. This is something the PMC is
-	    responsible for.</p>
-	    
-	    <p>Also, remember that the PMC consists of the same people that do
-	    the development work. There's no "bossing around" here. The PMC
-	    exists only to facilitate free software developers in "doing their
-	    thing", just like the ASF exists "to provide organizational, legal,
-	    and financial support for the Apache Open Source software
-	    projects".</p>
-	  </section>
-	  <section name="The PMC Chair and Officer of the Foundation">
-	    <p>The position of Directory PMC chair is an important one; the PMC
-	    chair has special responsibilities and privileges as detailed in
-	    the ASF bylaws.</p>
-	  </section>
-        <section name="Project Management Committee">
-        <p>For now all members form the current Directory PPMC:</p>
-      </section>
-    </body> 
-</document>
diff --git a/site/src/site/xdoc/community/process/release.xml b/site/src/site/xdoc/community/process/release.xml
deleted file mode 100644
index 22fe53b..0000000
--- a/site/src/site/xdoc/community/process/release.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Release Management</title>
-  </properties> 
-        <body>
-	  <section name="Not written yet....">
-	    <p>We haven't got our release process written down yet.</p>
-	  </section>
-	  <section name="Relevant links">
-	    <ul>
-<li><a href="http://jakarta.apache.org/site/decisions.html">Jakarta decision process</a></li>
-<li><a href="http://httpd.apache.org/dev/release.html">HTTPD release policy</a></li>
-<li><a href="http://cvs.apache.org/~bodewig/mirror.html">Distribution Mirroring HOWTO</a></li>
-<li><a href="http://cvs.apache.org/builds/">Nightly builds</a></li>
-<li><a href="http://gump.covalent.net/jars/latest/">Nightly builds: jars@covalent</a></li>
-<li><a href="http://freshmeat.net/articles/view/392/">Freshmeat on software builds</a></li>
-<li><a href="http://java.sun.com/docs/books/tutorial/jar/sign/signing.html">Java tutorial: jar signing</a></li>
-<li><a href="http://java.sun.com/j2se/1.4/docs/tooldocs/tools.html#security">JDK Security tool docs</a></li>
-<li><a href="http://cvs.apache.org/viewcvs.cgi/jakarta-tomcat-4.0/RELEASE-PLAN-4.1.txt">Tomcat 4 release plan</a></li>
-	    </ul>
-	  </section>
-	  <section name="Noel's thoughts">
-	    <p>Noel J. Bergman wrote to avalon-dev:</p>
-	    <source>
-[snip]
-Here are a few items to consider for the Release Plan:
-
-  1) Identify bugs and incompatibilities.
-  2) Decide which ones will be fixed.
-  3) Decide what other changes are necessary, e.g., packaging.
-  4) Make the code changes.
-  5) Test
-  6) Update the documentation and web site.
-
-[snip]
-Here are a few useful links:
-
-  Jakarta: http://jakarta.apache.org/site/decisions.html
-  Apache HTTPD release policies: http://httpd.apache.org/dev/release.html
-  Mirroring: http://cvs.apache.org/~bodewig/mirror.html
-
-[snip]
-	--- Noel
-	    </source>
-	  </section>
-        </body>
-</document>
diff --git a/site/src/site/xdoc/community/who/akarasulu.xml b/site/src/site/xdoc/community/who/akarasulu.xml
deleted file mode 100644
index 03549e6..0000000
--- a/site/src/site/xdoc/community/who/akarasulu.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-
-    <section name="Alex Karasulu">
-      <p>(akarasulu at apache dot org)</p>
-      
-      <p>
-        Alex wrote the LDAPd pure Java LDAP server and founded the LDAPd Group.
-        He eventually disolved the LDAPd Group and proposed and founded the 
-        Directory Project at Apache which absorbed the code base to the LDAPd 
-        Directory Server.
-      </p>
-      
-      <subsection name="Some Background">
-        <p> 
-          As a want-to-be enterprise architect and developer Alex had searched for a way 
-          to consolidate common data within an infrastructure into one single 
-          location to centralize it's management and allow for shared access.  
-          Such a centralized database would make enterprise integration of 
-          several applications and processes depending on this common 
-          information that much easier without duplication and consistancy 
-          issues.
-        </p>
-        
-        <p>
-          Alex first experimented with a centralized database to initially store
-          user accounts, passwords and authorization profiles for various
-          applications and resources within an enterprise.   Unfortunatly the 
-          use of an RDBMS was inhibiting.  It was a single point of failure 
-          which wound up becoming a bottle neck.  Furthermore the RDBMS was
-          not very conducive toward managing heirarchical data and delegating
-          control over it.  A new storage and access paradigm was required and
-          that's when Alex encountered the directory.
-        </p>
-        
-        <p>
-          After studying up on X.500 and LDAP Alex decided to design corporate
-          directories to facilitate in enterprise application integration and
-          the realization of workflows across these systems.  His experience 
-          lead to encounters with various directory servers which disappointed
-          him.  The directory servers encountered were a decade away from being
-          as robust as the RDBMS is for application developement.  Some of the 
-          rich features in the RDBMS have yet to be introduced into the world 
-          of the directory server or require a massive workaround to implement.
-          Things like stored procedures and triggers were most high on that 
-          list.
-        </p>
-        
-        <p>
-          Finally on October 16th 2002 Alex decided to write his own LDAP server
-          which had support for triggers and stored procedures.  On this day he 
-          registered a Sourceforge project called LDAPd and began building an
-          LDAP server.  He also founded the LDAPd Group which worked on the 
-          LDAPd server.  Eventually Jeff Machols, Robb Penoyer, Wes McKean and 
-          others joined the project.  Before a year the server had 3 releases at
-          sourceforge and an invitation was made by Apache to have the 
-          LDAPd project move there.   A proposal was written and submitted 
-          for the Apache Directory Project on September 3rd 2003.  The proposal 
-          was accepted by the ASF into the Apache incubator on October 30th 
-          2003.
-        </p>
-        
-        <p>
-          The dream of a robust pure Java LDAP server will be realized before 
-          exiting the incubator.  Most importantly the server will be free and 
-          supported by a healthy community of developers here at the ASF.
-        </p>
-      </subsection>
-      
-      <subsection name="Alex's Stuff">
-        <table>
-          <tr><td>Stuff</td><td>Description</td></tr>
-          
-          <tr>
-            <td>
-              <a href="http://sf.net/projects/ldapd">LDAPd</a>
-            </td>
-            <td>
-              This is the old LDAPd Sourceforge project started before the 
-              Directory Project existed at the ASF.
-            </td>
-          </tr>
-          
-          <tr>
-            <td>
-              <a href="../../project-proposal.html">Proposal</a>
-            </td>
-            <td>
-              This is the proposal submitted to the ASF to start the 
-              Directory Project as an incubator project.
-            </td>
-          </tr>
-          
-          <tr>
-            <td>
-              <a href="http://www.jroller.com/page/akarasulu">Blog</a>
-            </td>
-            <td>
-              Weblog containing random events, ideas and discussions.
-            </td>
-          </tr>
-          
-          <tr>
-            <td>
-              <a href="http://www.apache.org/~akarasulu">Homepage</a>
-            </td>
-            <td>
-              Homepage where you can find resources on directory
-              technologies and other peices of information.
-            </td>
-          </tr>
-          
-        </table>
-      </subsection>
-      
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/elecharny.xml b/site/src/site/xdoc/community/who/elecharny.xml
deleted file mode 100644
index 55d1174..0000000
--- a/site/src/site/xdoc/community/who/elecharny.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="elecharny@apache.org">Emmanuel lecharny</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Emmanuel Lecharny">
-      <p>(elecharny at apache dot org)</p>
-      <p>
-	    Emmanuel discovered Apache Directory Server 9 months ago, while 
-	    looking for alternatives to commercial LDAP directories and to the excellent 
-	    but non java-based OpenLDAP. He found this project very exciting and 
-	    promising and jumped on it.       
-      </p>
-    </section>
-    
-    <section name="Background">
-      <p>
-        Emmanuel is living and working in Paris - France since 1988.
-          
-		Since then, he has been working on a X400 messaging  system, where he first met with ASN.1. 
-		He developped a meta-directory above X400 MHS and also got involved on 
-		a variety of IT projects. He heard about Java in 1996, when it was just a 
-		buzz, and waited until 2000 to cut his teeth on it.
-      </p>
-      
-      <p>  
-		Emmanuel is at the moment mostly involved in the Twix sub-project. Twix is 
-		the third ASN.1 BER codec used by Apache Directory Server. Its goal is to be 
-		a much faster codec than Snickers, and a first step toward a complete ASN.1 codec generator. 
-		As with Snickers, it's a  <b>non-blocking</b>, <b>event-driven</b> codec.
-      
-		Both Codecs are pluggable in ApacheDS simply by modifying the configuration file.           
-          
-		Emmanuel has also started working on a LDAP proxy which is actually being developped actively by Jocelyn Dodin.       
-	  </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/erodriguez.xml b/site/src/site/xdoc/community/who/erodriguez.xml
deleted file mode 100755
index b9c4a14..0000000
--- a/site/src/site/xdoc/community/who/erodriguez.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="erodriguez@apache.org">Enrique Rodriguez</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Enrique Rodriguez">
-      <p>
-        (erodriguez at apache dot org)          
-      </p>
-      <p> 
-        Enrique is founder and lead developer for the Apache Kerberos server.
-      </p>
-      <p>
-        Enrique lives north of Boston in Burlington, MA, on the Route 128 tech corridor.  Burlington
-        is the east coast home for Oracle, Sun, Cognos, Siemens, and many others.
-      </p>
-      <p>
-        Enrique was formerly a systems architect contracting for Microsoft Consulting Services, the director of
-        implementation and principal product architect for a dot-com, and the Director of Global Systems for
-        Liberty Mutual Insurance.  His recreation and work experiences have taken him to 47 U.S. states
-        and to over 100 other locations across six continents.
-      </p>
-      <p>
-        Enrique earned a degree in Electrical Engineering and minored in the Biology of Behavior at Rensselaer (RPI).
-        Enrique is an avid mountaineer and has climbed the highest mountains in North America (Mt. McKinley, United
-        States), South America (Aconcagua, Argentina), Europe (Elbrus, Russian Federation), and Africa (Kilimanjaro,
-        Tanzania). Between climbing expeditions, Enrique competes for Team Mercury Multisport in triathlons and marathons.
-      </p>
-    </section>
-    <section name="Background">
-      <p> 
-        Enrique was dreaming of an all-Java stack and found there was a hole where Kerberos should have been.  After 3
-        long days, he had authentication working.  Within a couple of weeks he was able to migrate his home network off
-        of MIT Kerberos.  Realizing there would be tremendous potential if Kerberos were integrated tightly into the
-        Apache Directory, he approached Alex Karasulu in the late summer of 2004.  Soon thereafter, the Kerberos
-        codebase was granted to the Apache Software Foundation and Alex began to transform the standalone Kerberos
-        server into a plugin protocol provider that heavily leveraged the SEDA frontend framework and tightly integrated
-        with the Eve read-optimized backing store.
-      </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/ersiner.xml b/site/src/site/xdoc/community/who/ersiner.xml
deleted file mode 100644
index f8bbc72..0000000
--- a/site/src/site/xdoc/community/who/ersiner.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="ersiner@apache.org">Ersin Er</author>
-    <title>Apache Directory Project: Contributors</title>
-	<description>Ersin Er contributes to the Apache Directory Project,
-	which aims to produce a high performance and
-	production quality LDAP server written in Java.</description>
-  </properties>
-  <body> 
-
-    <section name="Ersin Er">
-      <p>(ersiner at apache dot org)</p>
-      
-      <p>
-        Ersin works on
-		<a href="http://directory.apache.org/subprojects/ldap.html">LDAP subproject</a>.
-		He has contributed several parsers for some recent additions
-		like Subentry and Access Control subsystems.
-		He also works on LDAP Triggers, Stored Procedures
-		and Views which will make LDAP and Apache Directory Server even more powerful.
-      </p>
-      
-      <subsection name="Some Background">
-        <p> 
-          Ersin was looking around for a good master's thesis subject and one day he
-		  met Alex Karasulu. He's now building his thesis around LDAP and
-		  Apache Directory Project in particular.
-        </p>
-
-		<p>
-	      Ersin lives in Ankara, Turkiye. He is a research assistant and graduate
-		  student at <a href="http://www.cs.hacettepe.edu.tr">
-		  Department of Computer Science and Engineering</a>,
-		  <a href="http://www.hacettepe.edu.tr">Hacettepe University</a>.
-		  He <i>likes</i> listening to 80's!
-	    </p>
-      </subsection>
-      
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/images/mcconnell.jpg b/site/src/site/xdoc/community/who/images/mcconnell.jpg
deleted file mode 100644
index acc1ea4..0000000
--- a/site/src/site/xdoc/community/who/images/mcconnell.jpg
+++ /dev/null
Binary files differ
diff --git a/site/src/site/xdoc/community/who/index.xml b/site/src/site/xdoc/community/who/index.xml
deleted file mode 100644
index c389371..0000000
--- a/site/src/site/xdoc/community/who/index.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Who we are</title>
-  </properties> 
-  <body>
-    <section name="Active Committers">
-      <p>
-      The current Directory committers are: 
-      adc, akarasulu, bayard, bloritsch, brett, 
-      elecharny, erodriguez, ersiner, jmachols, niklas, noel, 
-      psteitz, szoerner, trustin, vtence, wesmckean
-      </p>
-    </section>
-    <section name="Inactive Committers">
-      <p>
-      The current inactive Directory committers (an inactive committer is
-      someone who hasn't done a cvs commit in three months, or hasn't
-      bothered to move himself from this list to the one above) are:
-      none yet.
-      </p>
-    </section>
-    <section name="Emeritus Committers">
-      <p>
-       The current emeritus committers (an emeritus committer is
-      someone who is not active within the Directory Project anymore)
-      are: none yet.
-      </p>
-    </section>
-    <section name="Contributors">
-      <p>
-      Contributors are: Nick Faiz
-      </p>
-      <p>
-      If you are a contributor but are not listed, submit a patch for the site docs.
-      </p>
-    </section>
-  </body>
-
-</document>
diff --git a/site/src/site/xdoc/community/who/jmachols.xml b/site/src/site/xdoc/community/who/jmachols.xml
deleted file mode 100644
index 2241391..0000000
--- a/site/src/site/xdoc/community/who/jmachols.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="jmachols@apache.org">Jeff Machols</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Jeff Machols">
-      <p>
-        (jmachols at apache dot org)          
-      </p>
-      
-      <p> 
-        Jeff is one of the original members of the LDAPd group founded by 
-        Alex Karasulu. He came into the Apache Software Foundation when it 
-        absorbed the LDAPd source code and members.
-      </p>
-    </section>
-    
-    <section name="Background">
-      <p> 
-        Jeff had the good fortune of becoming associated with Alex Karasulu 
-        at a pivotal time early in 2002. Alex had some frustrations with LDAP 
-        due to deficiencies in all of the servers he used and was toying with 
-        the idea of writing one. Jeff's initial role was simply to serve as a 
-        sounding board for ideas. As time went on and he heard not only the 
-        ideas but, the passion of Alex about this endeavor, Jeff eagerly
-        accepted Alex's invitation to become involved in the LDAPd project.
-      </p>
-      
-      <p> 
-        Jeff's primary focus on the project is the client side of LDAP. After a 
-        struggle implementing Unix user authentication with other LDAP servers 
-        and clients, he saw additional opportunity for improvement. The goal of 
-        the client and LDAP common sub-project is to provide a set LDAP tools 
-        to match the ease of use, flexibility and rich features of Eve. 
-      </p>
-      
-      <p> 
-        Jeff's also worked closely with the Apache Infrastructure team, 
-        especially Noel Bergman, to import the LDAPd CVS source code into 
-        Subversion. The Apache Directory project was one of the first to 
-        implement Subversion. 
-      </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/mcconnell.xml b/site/src/site/xdoc/community/who/mcconnell.xml
deleted file mode 100644
index 92b02ba..0000000
--- a/site/src/site/xdoc/community/who/mcconnell.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Stephen McConnell">
-      <p>(mcconnell at apache dot org)</p>
-      <subsection name="Activities">
-      <p>
-Responsible for the coordination and management of many international development projects dealing with large-scale collaborative software development.  These projects have involved community building, bootstrap financing (venture capital, government programmes, industrial sponsorship and partnerships), financial coordination and adminstration, operations, and technical direction.  
-      </p>
-      <p>
-Technical expertise includes an in-depth knowledge of CORBA core infrastructure, the IDL and PSDL languages, related common services (naming, PSS, Time, Notification, interceptor and activator frameworks).  Comprehensive knowledge of component management systems, component lifecycle concepts, container solutions, component assembly strategies, component isolation, and federation mechanisms. Experience with Java, J2EE, Servlet and related development tools.
-      </p>
- 
-      <p>
-Software Engineering and Best Practices experience is derived from the management and coordination of several large projects in the service management area -  provided the opportunity to explore different approaches to service management.  This has included assessment of the technical, human and social factors that contribute to functional, usable, and maintainable business systems and in-depth work related to Component and Service Oriented Programming (COP and SOP) and the related principals of SOC and IoC.
-      </p>
-
-      <p>
-Early experience related to advanced research in the area of distributed multi-agent systems served as the foundations business-level application strategies and related peer-to-peer architectures. Responsible for the initiation of several research and development projects in this area, culminating in the OSM development of a peer-to-peer service management platform.
-      </p>
-    </subsection>
-    <subsection name="Projects">
-<p>
-Lead several international projects related to service management and distribution (from advanced research through to practical application trials).  The most relevant of these projects are listed in the following table.
-</p>
-  <table>
-    <tr><th>Subject</th><th>Description</th></tr>
-     <tr><td>Open Source Initative</td>
-        <td>Originator and lead developer of the <a href="http://avalon.apache.org/merlin">Apache Avalon Merlin</a> component management platform - an advanced solution dealing with auto-assembly, premptive deployment strategies, based on a full model-driven component architecture. Member of the <a href="http://avalon.apache.org/index.html">Avalon PMC</a> and <a href="http://incubator.apache.org/directory/index.html">Apache Directory PMC"</a>.  Founding member of the <a href="http://openorb.sourceforge.net/">Community OpenORB Project</a>.</td>
-    </tr>
-    <tr><td>Interactive Environments for Distributed Process Management</td>
-        <td>The development of an interactive environment for business-to-business service management. Project coordinated by OSM SARL.  Research aspects undertaken by Imperial College London.  Project involved development of architectural approaches to service policy declaration and the establishment of formal standards in the community and collaboration areas under the <a href="http://www.omg.org">OMG</a>.
-         </td>
-    </tr>
-    <tr><td>Cross-Enterprise Digital Product Management</td>
-         <td>A Developer Platform capable of auto-generating complex business systems; an Enterprise Platform capable of executing generated business processes. The project involved approximately 50 participants across 13 partner organisations spanning Europe and the United States.  Responsibilities included consortium establishment, administration, management and technical lead.</td>
-     </tr>
-     <tr><td>The Open Software Architecture Forum</td>
-        <td>Resolution of a common methodology and architectures for embedded systems dealing with distributed internet based services. The project established a reference architecture for the European Commission OMI Project and completed several demonstrations and proof of concept solutions validating the integration of distributed service management into intelligent devices. Responsibilities covered project direction and technical lead.</td>
-      </tr>
-     </table>
-    </subsection>
-    <subsection name="Snapshot">
-      <p><img src="images/mcconnell.jpg"/></p>
-    </subsection>
-    </section>
-  </body>
-</document>
-
-
-
diff --git a/site/src/site/xdoc/community/who/noel.xml b/site/src/site/xdoc/community/who/noel.xml
deleted file mode 100644
index 6d9fdc2..0000000
--- a/site/src/site/xdoc/community/who/noel.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Noel J. Bergman">
-      <p> See Noel's homepage  
-      <a href="http://www.apache.org/~noel">here</a>
-      </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/psteitz.xml b/site/src/site/xdoc/community/who/psteitz.xml
deleted file mode 100644
index 1544e9d..0000000
--- a/site/src/site/xdoc/community/who/psteitz.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Phil Steitz">
-      <p>(psteitz at apache dot org)</p>
-      <p>
-        Phil works on Naming. 
-      </p>
-      <p>
-        <a href="http://www.apache.org/~psteitz">Phil's Apache home page</a>
-      </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/rpenoyer.xml b/site/src/site/xdoc/community/who/rpenoyer.xml
deleted file mode 100644
index 41d4951..0000000
--- a/site/src/site/xdoc/community/who/rpenoyer.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Robb Penoyer">
-      <p>(rpenoyer at apache dot org)</p>
-      <p>
-      Talk about Robb here.
-      </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/szoerner.xml b/site/src/site/xdoc/community/who/szoerner.xml
deleted file mode 100644
index 0bca5a4..0000000
--- a/site/src/site/xdoc/community/who/szoerner.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="szoerner@apache.org">Stefan Zoerner</author>
-    <title>Apache Directory Project: Contributors</title>
-    <description>Stefan Zoerner contributes to the Apache Directory Project, which aims to produce a high performance and production quality LDAP server written in Java.</description>
-  </properties>
-  <body> 
-
-    <section name="Stefan Zoerner">
-
-      <p>(szoerner at apache dot org)</p>
-
-      <p>
-        Stefan's main focus is end user experience for the LDAP server. 
-        One of his goals is to make the Apache Directory Server behave as an arbitrary LDAP client would expect.
-        Therefore he started to create a test suite for black box and regression testing.
-      </p>
-
-      <subsection name="Some Background">
-      <p>
-	    Stefan Zoerner lives with his family near Hamburg, Germany. 
-	    He collects ancient postcards and Sun workstations and likes to write IT related articles (about LDAP topics, sometimes).
-	    In May 2004, Stefan published a German LDAP book for Java developers
-	    (<a href="http://www.entwickler-press.de/buecher/ldap/">LDAP fuer Java-Entwickler</a>), 
-	    the second edition appeared in November 2005:
-	  </p>
-	  <p><a href="http://www.entwickler-press.de/buecher/ldap/"><img src="../../images/szoerner_cover_ldap2_100x149.gif"/></a></p>
-	  <p>
-	    The book itself is server independent, and Stefan was interested whether
-	    the examples work on Apache Directory Server as well. This is how he found the project. 	    
-	  </p>
-      <p> 
-        In his commercial life, Stefan is an Advisory IT Architect at IBM e-business 
-        Innovation Center in Hamburg, Germany. 
-      </p>
-      </subsection>
-
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/community/who/trustin.xml b/site/src/site/xdoc/community/who/trustin.xml
deleted file mode 100644
index 1262918..0000000
--- a/site/src/site/xdoc/community/who/trustin.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="trustin@apache.org">Trustin Lee</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Trustin Lee">
-      <p>
-        (trustin at apache dot org)          
-      </p>
-
-      <p> 
-        Trustin is a lead developer for the Apache SEDA framework, and he is
-        working on MINA (Multipurpose Infrastructure for Network Applications)
-        to improve SEDA framework from ground-up.
-      </p>
-      
-      <p>
-        Trustin was born in 1980.  He started programming with built-in BASIC
-        interpreter in MSX mini computer when he was 8 years old.  He enjoyed
-        game programming and problem solving using assembly language, C, and
-        C++.  Finally, he wins bronze medal at Korea information olympiad in
-        1998.
-      </p>
-      
-      <p>
-        He worked for several companies as a part time worker who
-        writes high-performance network server applications and a few web
-        applications after he started to major computer science in Yonsei
-        university in South Korea.  After graduation, he is working for Arreo
-        Communications, Inc which is one of the biggest SMS (mobile short
-        message service) provider in Korea.
-      </p>
-
-      <p>
-        Trustin spends his free time taking photos with his lovely SLR camera
-        and listening to his favorite compact discs (Japanese pop and Jazz).
-      </p>
-    </section>
-    <section name="Background">
-      <p>
-        Trustin was getting bored implementing tedious legacy protocols.  He
-        thought he could save himself by creating a generic framework for
-        network applications.  The name of the framework was 'Netty' and
-        it has been improved for a couple of years until java.nio package is
-        introduced.
-      </p>
-      
-      <p>
-        NIO changed lots of things, and it impacted Netty.  New version of
-        Netty was named to Netty2 and released as open source.  It gave Trustin
-        the experience of open source community and made him fascinated by it.
-      </p>
-      
-      <p>
-        Enrique Rodriguez was one of the users of Netty2, and he brought great 
-        fortune to Trustin.  He metioned Netty2 when he approached Alex
-        Karasulu, who was the lead for the Apache Directory project.  Alex was
-        developing SEDA framework as a network application framework at that
-        time.  He proposed Trustin to get the power of both together and make
-        the best network application framework available, and the work is in
-        progress actively.
-      </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/vtence.xml b/site/src/site/xdoc/community/who/vtence.xml
deleted file mode 100644
index 933a653..0000000
--- a/site/src/site/xdoc/community/who/vtence.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="vtence@apache.org">Vincent Tence</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Vincent Tence">
-      <p>
-        (vtence at apache dot org)          
-      </p>
-      
-      <p> 
-        Vincent works on Janus, the security sub-project.
-      </p>
-      <p>
-        Vincent lives in Montreal, Canada. He is an enthusiast Agile Software Developer, Scrum Master and eXtreme Programming practioner.
-        Vincent is actively involved in the Montreal XP Users Group and the Agile Montreal Group. 
-        Cold winter in Montreal give him enough time to hack on Open Source projects too.
-      </p>
-    </section>
-    
-    <section name="Background">
-      <p> 
-        Vincent was starting to work on a security project at sourceforge when he met Alex. Alex was interested in security
-        in the context of the LDAPd project. Soon after, LDAPd moved to become the Apache Directory Project. 
-        Later, Alex and Vincent decided to join forces and Vincent joined the Apache Directory Project team
-        to work on the security subsystem. 
-      </p>
-    </section>
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/community/who/wesmckean.xml b/site/src/site/xdoc/community/who/wesmckean.xml
deleted file mode 100644
index a96d888..0000000
--- a/site/src/site/xdoc/community/who/wesmckean.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document> 
-  <properties>
-    <author email="wesmckean@apache.org">Wes McKean</author>
-    <title>Apache Directory Project: Contributors</title>
-  </properties>
-  <body> 
-    <section name="Wes McKean">
-      <p>(wesmckean at apache dot org)</p>
-      <p>
-      Wes is one of the newest members of the LDAPd group, and a founding
-      member of the Apache Directory Project, having joined the Apache Software
-      Foundation when LDAPd was absorbed into the Apache incubator.
-      </p>
-    </section>
-    
-    <section name="Background">
-      <p>
-	      As an IT profressional, entrepreneur, and father, Wes has worked in the Atlanta
-	      metro area for over 14 years.  Wes has always had a special love for Open Source
-	      initiatives and their authors, having used open source applications with many of
-	      the companies for which he has worked.  Wes discovered LDAPd and Alex Karasulu
-	      while searching for an open source project to integrate into his current employer's
-	      commercial offerings.  Having found LDAPd on SourceForge, he immediately got
-	      excited about the synergies between the two products, and realized that Wes and
-	      LDAPd had a lot to offer each other.
-      </p>
-      
-      <p>  
-          Wes is current involved with the Snickers subproject.  Snickers is a drop in
-          replacement for the ASN.1 codec used by Eve.  
-          The Snickers subproject itself is broken up
-          into compiler and coder/decoder subprojects.  Snickers will be a <b>non-blocking,
-          event driven</b> parser, setting itself apart from currently available open
-          source and commercial offerings.
-      </p>
-      
-      <p> 
-          Wes has taken a great interest in the database sub-system used by Eve and the orignal
-          LDAPd server.  He has written several new backends, and also a entirely new indexing
-          scheme to handle the various technical challenges of the LDAP persistent storage.
-      </p>
-    </section>
-    
-  </body>
-</document>
-
diff --git a/site/src/site/xdoc/index.xml b/site/src/site/xdoc/index.xml
deleted file mode 100644
index 111f6b7..0000000
--- a/site/src/site/xdoc/index.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Welcome !</title>
-    <description>The Apache Directory Project aims to produce a high performance and production quality LDAP server written in Java.</description>
-  </properties>
-  <body>
-
-    <section name="News">
-    <ul>
-      <li><b><a href="http://www.opengroup.org/openbrand/register/brand3527.htm">ApacheDS 1.0 has been certified by the Open Group as an LDAPv3 compatible server!</a></b></li>
-      <li><b><a href="subprojects/apacheds/releases.html">ApacheDS 1.0 is out!</a></b></li>
-    </ul>
-    </section>
-    <section name="What is it?">
-      <p>
-        Before going into all the details here's what the Apache Directory
-        Server looks like from an architectural perspective.
-      </p>
-
-      <map name="directory">
-  <area shape="rect" alt="Network Layer" href="subprojects/mina/index.html" target="subprojects/mina/index.html" title="Network Layer" coords="39,155,603,175" />
-  <area shape="rect" alt="Protocol Providers" href="subprojects/apacheds/subsubprojects/index.html" target="subprojects/apacheds/subsubprojects/index.html" title="Protocol Providers" coords="44,175,595,207" />
-  <area shape="rect" alt="Apache Directory Server Core" href="subprojects/apacheds/subsubprojects/index.html" target="subprojects/apacheds/subsubprojects/index.html" title="Apache Directory Server Core" coords="209,277,612,443" />
-  <area shape="rect" alt="Kerberos Provider" href="subprojects/apacheds/subsubprojects/index.html" target="subprojects/apacheds/subsubprojects/index.html" title="Kerberos Provider" coords="457,210,530,225" />
-  <area shape="rect" alt="LDAP Provider" href="subprojects/apacheds/subsubprojects/index.html" target="subprojects/apacheds/subsubprojects/index.html" title="LDAP Provider" coords="374,210,448,225"/>
-  <area shape="rect" alt="DNS Provider" href="subprojects/apacheds/subsubprojects/index.html" target="subprojects/apacheds/subsubprojects/index.html" title="DNS Provider" coords="209,210,283,224" />
-  <area shape="rect" alt="DHCP Provider" href="subprojects/apacheds/subsubprojects/index.html" target="subprojects/apacheds/subsubprojects/index.html" title="DHCP Provider" coords="128,210,202,225" />
-  <area shape="rect" alt="NTP Provider" href="subprojects/apacheds/subsubprojects/index.html" target="subprojects/apacheds/subsubprojects/index.html" title="NTP Provider" coords="44,209,118,224" />
-</map>
-<img usemap="directory" src="images/50k-ft-architecture.png"/>
-    </section>
-    <section name="Our Vision">
-      <p>
-        Our primary vision (others also outlined below) is to build an 
-        enterprise directory server platform (and its components) where 
-        other Internet services snap in to store their data within the 
-        directory so they may be managed using LDAP.  From the image 
-        above you'll see the architecture is designed so services besides
-        LDAP like DNS, DHCP, SLP and Kerberos will snap in.  Other services
-        like UDDI can also be implemented and snapped in.  These services 
-        will use a common networking layer and each can be toggled on and
-        off according to the needs of the environment.  apseda, mina, or 
-        sedang are various frameworks used for the common network layer. 
-        These services share the common network layer and back their data 
-        within the Apache Directory Server's backing stores without any 
-        network latency or going through the LDAP line protocol.  NTP btw
-        is the only exception and it's there to remedy the need for time 
-        sync for replication and other time sensitive protocols like kerberos.
-        Its implementation here is intended to prevent any dependency on
-        external infrastructure.
-      </p>
-
-      <p>
-        Other aspects to our vision include becoming the JNDI goto project and 
-        also becoming the one stop shop for all directory and naming concerns 
-        here at the ASF.  These concerns may be outside of the scope of JNDI 
-        or may not even fall under Java.
-      </p>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/others.xml b/site/src/site/xdoc/others.xml
deleted file mode 100644
index bdb8044..0000000
--- a/site/src/site/xdoc/others.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Others using Directory Software</title>
-  </properties> 
-  
-  <body>
-
-    <section name="Others using Apache Directory Software">
-        <table>
-          <tr>
-            <th>Company/Project</th>
-            <th>Summary</th>
-          </tr>
-          <tr>
-            <td><a href="http://geronimo.apache.org/">
-               <img src="http://geronimo.apache.org/images/geronimo-logo.png"/></a>
-            </td>
-            <td>Apache Geronimo is the J2EE server project of ASF.</td>
-          </tr>
-          <tr>
-            <td><a href="http://directory.fedora.redhat.com/">
-               <img src="http://fedora.redhat.com/images/header-fedora_logo01.png"/></a>
-            </td>
-            <td>The NT4 LDAP Service of Fedora Directory Server
-            is based on Apache Directory Server.</td>
-          </tr>
-
-          <tr>
-            <td><a href="http://portals.apache.org/jetspeed-2/"> 
-               <img src="images/jetspeed-logo.gif"/></a>
-            </td>
-            <td>Jetspeed-2 is the next-generation enterprise portal at Apache. 
-            It provides an embedded LDAP configuration through the Apache Directory Server.</td>
-          </tr>
-          <tr>
-            <td><a href="http://safehaus.org/"> 
-               <img src="http://safehaus.org/safehaus-small.gif"/></a>
-            </td>
-            <td>An effort focusing on developing security products and services
-                to augment the value of the Apache Directory Server.</td>
-          </tr>
-        </table>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/projects/jndi.xml b/site/src/site/xdoc/projects/jndi.xml
deleted file mode 100755
index 812dfd6..0000000
--- a/site/src/site/xdoc/projects/jndi.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Subprojects</title>
-  </properties>
-  
-  <body>
-    <section name="JNDI">
-      <p> 
-        The Directory Project consists of a number of sub-projects. 
-      </p>
-      
-      <table>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-        </tr>
-        
-        <tr>
-          <td>
-            <a href="directory-naming/index.html">Naming</a>
-          </td>
-          <td>
-            <p>
-              There is a set of core functionality common to all JNDI providers
-              and JNDI does not necessarily revolve around LDAP and X.500
-              directories.  The naming subproject will contain common JNDI code
-              along with various JNDI provider's.  A J2EE ENC, environment
-              naming context would be one implementation.  If you're looking to
-              build a JNDI provider you might want to take a look in here before
-              proceeding.
-            </p>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="apacheds/projects/apacheds-core/index.html">ApacheDS Core</a>
-          </td>
-          <td>
-            <p>
-              ApacheDS' core is also a JNDI provider for the LDAP namespace.  
-              This provider is not an LDAP client but operates on entries stored
-              locally on disk within ApacheDS' databases.  It is a server-side 
-              JNDI LDAP provider in this respect although the concept of a 
-              server side JNDI provider is strange.
-            </p>
-          </td>
-        </tr>
-
-      </table>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/projects/kerberos.xml b/site/src/site/xdoc/projects/kerberos.xml
deleted file mode 100755
index dea940d..0000000
--- a/site/src/site/xdoc/projects/kerberos.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Kerberos Provider Services</title>
-  </properties>
-  
-  <body>
-    <section name="Kerberos Services">
-      <p> 
-        The Directory Project consists a couple Kerberos related services. 
-      </p>
-      
-      <table>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-        </tr>
-        
-        <tr>
-          <td>
-            <a href="providers/kerberos/index.html">Kerberos Provider</a>
-          </td>
-          <td>
-            <p>
-              A Kerberos 5 service provider plugin or in other words a key 
-              distribution center, based on 
-              <a href="http://www.faqs.org/rfcs/rfc1510.html">RFC 1510</a> 
-              which stores its data within ApacheDS. 
-            </p>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="providers/changepw/index.html">Changepw Provider</a>
-          </td>
-          <td>
-            <p>
-              Change password is a protocol that uses Kerberos infrastructure 
-              to allow users to securely set new passwords. This ApacheDS 
-              provider implements the changepw protocol defined in 
-              <a href="http://www.faqs.org/rfcs/rfc3244.html">RFC 3244</a>.
-            </p>
-          </td>
-        </tr>
-
-      </table>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/projects/ldap.xml b/site/src/site/xdoc/projects/ldap.xml
deleted file mode 100755
index 1ce197b..0000000
--- a/site/src/site/xdoc/projects/ldap.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Subprojects</title>
-  </properties>
-  
-  <body>
-    <section name="LDAP Server">
-      <p> 
-        The Directory Project consists of a number of sub-projects. 
-      </p>
-      
-      <table>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-        </tr>
-        
-        <tr>
-          <td>
-            <a href="shared/ldap/index.html">LDAP Common</a>
-          </td>
-          <td>
-            <p>
-              Shared LDAP API for implementing other API's, clients, and servers
-            </p>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="clients/ldap/index.html">LDAP Clients</a>
-          </td>
-          <td>
-            <p>
-              A set of LDAP clients built on top of LDAP Common
-            </p>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="apacheds/index.html">ApacheDS</a>
-          </td>
-          <td>
-            <p>
-              ApacheDS is a modular LDAP server written in Java.
-            </p>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="providers/ldap/index.html">LDAP Provider</a>
-          </td>
-          <td>
-            <p>
-              The LDAP Protocol Provider implementing the line protocol.
-            </p>
-          </td>
-        </tr>
-      </table>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/projects/providers.xml b/site/src/site/xdoc/projects/providers.xml
deleted file mode 100755
index a2e5b15..0000000
--- a/site/src/site/xdoc/projects/providers.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-      <author email="akarasulu@apache.org">Alex Karasulu</author>
-      <author email="erodriguez@apache.org">Enrique Rodriguez</author>
-    <title>Protocol Provider Subprojects</title>
-  </properties>
-  <body>
-    <section name="Protocol Providers">
-      <p> The Apache Directory Project's Protocol Providers are Java implementations of
-        standard Internet services. These Protocol Providers, in conjunction with the MINA
-        network layer and the Apache Directory read-optimized backing store, provide
-        easy-to-use yet fully-featured Internet services. As implemented within the Apache
-        Directory, these services benefit from: </p>
-      <ul>
-        <li>Standard directory model and schema support</li>
-        <li>Standard LDAP data interchange format (LDIF) (RFC 2849)</li>
-        <li>Optional LDAP management</li>
-        <li>UDP and TCP Support (MINA)</li>
-        <li>Traffic throttling (MINA)</li>
-        <li>Overload shielding (MINA)</li>
-        <li>Easy POJO embeddability for containers such as Geronimo, JBoss, and OSGi</li>
-      </ul>
-      <table>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-        </tr>
-        <tr>
-          <td>
-            <a href="providers/ldap/index.html">Lightweight Directory Access Protocol (LDAP)
-              Provider</a>
-          </td>
-          <td>
-            <p> An LDAP implementation based on <a
-              href="http://www.faqs.org/rfcs/rfc2251.html">RFC 2251</a>. Apache LDAP
-              provides lightweight access to the Apache Directory backing store.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <a href="providers/kerberos/index.html">Kerberos Protocol Provider</a>
-          </td>
-          <td>
-            <p> A Kerberos implementation based on <a
-              href="http://www.faqs.org/rfcs/rfc1510.html">RFC 1510</a>. Apache
-              Kerberos verifies the identities of principals (users or services) on
-              an unprotected network using principal information stored in the Apache
-              Directory backing store.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <a href="providers/changepw/index.html">Change Password Protocol Provider</a>
-          </td>
-          <td>
-            <p> A Change Password implementation based on <a
-              href="http://www.faqs.org/rfcs/rfc3244.html">RFC 3244</a>. Apache
-              Change Password uses Kerberos infrastructure to allow users to securely
-              set initial passwords or to change existing passwords stored in the
-              Apache Directory backing store.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <a href="providers/dns/index.html">Domain Name System (DNS) Protocol Provider</a>
-          </td>
-          <td>
-            <p> A DNS implementation based on <a
-              href="http://www.faqs.org/rfcs/rfc1034.html">RFC 1034</a>. Apache DNS
-              serves host name to address mappings and other resource record types
-              using resource records stored in the Apache Directory backing store.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <a href="providers/ntp/index.html">Network Time Protocol (NTP) Provider</a>
-          </td>
-          <td>
-            <p> An NTP implementation based on <a
-              href="http://www.faqs.org/rfcs/rfc2030.html">RFC 2030</a>. Apache NTP
-              supports time synchronization for LDAP replication and the Kerberos
-              protocol, eliminating the need for external infrastructure.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <a href="providers/dhcp/index.html">Dynamic Host Configuration Protocol (DHCP)
-              Provider</a>
-          </td>
-          <td>
-            <p> A DHCP implementation based on <a
-              href="http://www.faqs.org/rfcs/rfc2131.html">RFC 2131</a>. Apache DHCP
-              helps configure hosts using configuration information stored in the
-              Apache Directory backing store.</p>
-          </td>
-        </tr>
-      </table>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/projects/security.xml b/site/src/site/xdoc/projects/security.xml
deleted file mode 100755
index b36ae79..0000000
--- a/site/src/site/xdoc/projects/security.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Subprojects</title>
-  </properties>
-  
-  <body>
-    <section name="Security">
-      <p> 
-        The Directory Project consists of a number of sub-projects. 
-      </p>
-      
-      <table>
-        <tr>
-          <th>Name</th>
-          <th>Description</th>
-        </tr>
-        
-        <tr>
-          <td>
-            <a href="authx/index.html">AuthX</a>
-          </td>
-          <td>
-            <p>
-              AuthX is an Authentication, Authorization and Accounting framework.
-            </p>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="kerberos/index.html">Kerberos</a>
-          </td>
-          <td>
-            <p>
-              A pure Java Kerberos 5 Server implementation based on
-              <a href="http://www.faqs.org/rfcs/rfc1510.html">RFC 1510</a> which
-              stores data in any LDAP store via JNDI (which includes ApacheDS).
-              (Yep this is referenced in two different places but it fits.)
-            </p>
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="kerberos/changepw.html">Changepw</a>
-          </td>
-          <td>
-            <p>
-              Change password is a request reply protocol that uses Kerberos
-              infrastructure to allow users to securely set new passwords. This
-              server is a pure Java implementation of the changepw protocol
-              defined in <a href="http://www.faqs.org/rfcs/rfc3244.html">
-              RFC 3244</a>.
-              (Yep this is referenced in two different places but it fits.)
-            </p>
-          </td>
-        </tr>
-
-        </table>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/projects/sitedocs/hyperlink-management.xml b/site/src/site/xdoc/projects/sitedocs/hyperlink-management.xml
deleted file mode 100644
index 89e9717..0000000
--- a/site/src/site/xdoc/projects/sitedocs/hyperlink-management.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: </title>
-  </properties> 
-  
-  <body>
-    <section name="Links Howto">
-      <p>
-        All links to documents within the same subproject are relative to that 
-        subproject.  Links to resources outside the subproject must take into
-        account the relative position of the target directory the subproject's
-        generated content is copied into.
-      </p>
-      
-      <p>
-        For example the 'directory' link in the sitedocs project is simply
-        '/index.html'.  The same 'directory' line in the Eve subproject will
-        be '../../index.html'.  This is because the Eve project's generated
-        content ultimately resides two directories deep with the sitedocs 
-        project's document root here: './subprojects/eve'.  It takes a 
-        '../../' to get to the index.html that is the home page for the TLP
-        site.
-      </p>
-      
-      <p>
-        Links to Apache, Directory, Eve, LDAP, Naming, Janus, Snickers and
-        Sitedocs must be maintained by all subprojects to keep the overall
-        site consistant.
-      </p>
-    </section>
-    
-      <section name="Navigations">
-        <p>
-          Maintaining a consistant look and feel means perserving the top level
-          site's menus.  To do this you'll need to work with the same navigation
-          and this requires the following navigation.xml template:
-        </p>
-        
-        <source>
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-
-&lt;project&gt;
-
- &lt;title&gt;Apache Directory Project&lt;/title&gt;
-
- &lt;body&gt;
-
-    &lt;links&gt;
-      &lt;item name="Apache" href="http://apache.org/"/&gt;
-      &lt;item name="Directory" href="../../index.html"/&gt;
-      &lt;item name="Server" href="/index.html"/&gt;
-      &lt;item name="LDAP" href="../ldap/index.html"/&gt;
-      &lt;item name="Naming" href="../naming/index.html"/&gt;
-      &lt;item name="AuthX" href="../authx/index.html"/&gt;
-      &lt;item name="ASN1" href="../asn1/index.html"/&gt;
-      &lt;item name="Sitedocs" href="../sitedocs/index.html"/&gt;
-    &lt;/links&gt;
-
-    &lt;menu name="About Directory"&gt;
-      &lt;item name="Overview" href="../../index.html"/&gt;
-      &lt;item name="Community" href="../../community/index.html"/&gt;
-      &lt;item name="Latest News" href="../../news.html"/&gt;
-      &lt;item name="Subprojects" href="../../subprojects/index.html"&gt;
-        &lt;item name="Server" href="/index.html"/&gt;
-        &lt;item name="LDAP" href="../ldap/index.html"/&gt;
-        &lt;item name="AuthX" href="../authx/index.html"/&gt;
-        &lt;item name="Naming" href="../naming/index.html"/&gt;
-        &lt;item name="ASN1" href="../asn1/index.html"/&gt;
-        &lt;item name="Sitedocs" href="../sitedocs/index.html"/&gt;
-      &lt;/item&gt;
-      &lt;item name="Documentation" href="../../doc/index.html"/&gt;
-    &lt;/menu&gt;
-
-    &lt;menu name="Resources"&gt;
-      &lt;item name="IRC" href="../../irc.html"/&gt;
-      &lt;item name="Jira" href=
-        "http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10400"/&gt;
-      &lt;item name="Wiki" href="http://wiki.apache.org/directory"/&gt;
-      &lt;item name="Lists" href="../../mailing-lists.html"/&gt;
-      &lt;item name="License" href="../../license.html"/&gt;
-      &lt;item name="Sandbox" href="../../sandbox/index.html"/&gt;
-      &lt;item name="Downloads" href="../../download.cgi"/&gt;
-      &lt;item name="Subversion" href="../../svn.html"/&gt;
-      &lt;item name="Related Projects" href="../../related/index.html"/&gt;
-    &lt;/menu&gt;
-
- &lt;/body&gt;
-
-&lt;/project&gt;
-        </source>
-        
-        <p>
-          You can download this navigation template from 
-          <a href="./nav-template.txt">here</a>.  Remember you take this 
-          template and expand one of the subproject nodes to the number and kind
-          of subitems of your choosing by breaking up into a two part tag and
-          embedding more items within.  For example this is how the Eve 
-          subproject site navigation is structured:
-        </p>
-        
-        <source>
-        &lt;item name="Eve" href="/index.html"&gt;
-          &lt;item name="Design" href="/design/index.html"/&gt;
-          &lt;item name="Features" href="/features.html"/&gt;
-          &lt;item name="Backend" href="/backend/index.html"/&gt;
-          &lt;item name="Frontend" href="/frontend/index.html"/&gt;
-        &lt;/item&gt;
-        </source>
-      </section>
-      
-      <section name="Links">
-        <p>
-          Check out the section talking about links.  All we do here is let you
-          know that you have to keep in mind the distance between the TLP site
-          documents and your subproject's site in the final deployed state.  
-          Basically you have <b>subprojects/[supproject-name]</b> in the way.
-          That means two relative levels up to get to TLP resources while the
-          resources local to the project are still accessed as relative 
-          resources.
-        </p>
-        
-        <p>
-          If you have questions just take a look at the links section and the
-          links in the navigation template above.  If you still have questions
-          use trial and error until you develope a feel for it.  Just generate
-          the document and see if it works locally by pointing a browser to it.
-          If you still need help post to the list.
-        </p>
-      </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/projects/sitedocs/index.xml b/site/src/site/xdoc/projects/sitedocs/index.xml
deleted file mode 100644
index 3f13f07..0000000
--- a/site/src/site/xdoc/projects/sitedocs/index.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: Web Site Documentation</title>
-  </properties>
-
-  <body>
-    <section name="Overview">
-      <p>
-        This subproject contains documents of the top level website linking 
-        together all subprojects.  There are a few rules and some information
-        that is needed by subproject developers in order to integrate/plugin
-        their subproject documentation with this TLP website.  We cover these
-        topics here.
-      </p> 
-      
-      <table>
-        <tr>
-          <th>Topic</th>
-          <th>Description</th>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="./maven-changes.html">Maven Changes</a>
-          </td>
-          <td>
-            Changes to the subproject's Maven configuration are needed.  This
-            document steps through making those changes.
-          </td>
-        </tr>
-        
-        <tr>
-          <td>
-            <a href="./hyperlink-management.html">Hyperlink Management</a>
-          </td>
-          <td>
-            Because a separate Maven site build is used to generate subproject
-            documentation and the generated documents are repositioned some
-            precautions must be taken to make hyperlinks and navigations work
-            properly.  This document explains the problem, and how to work 
-            around it for navigations and hyperlinks.
-          </td>
-        </tr>
-
-        <tr>
-          <td>
-            <a href="./sitedoc-deployment.html">Sitedoc Deployment</a>
-          </td>
-          <td>
-            When changes are made to sitedocs and subproject sitedocs developers
-            need to deploy those changes to the website.  This document 
-            describes the way incubator projects are setup and what the process
-            is for building and deploying the sitedocs for the TLP and 
-            subprojects.
-          </td>
-        </tr>
-        
-      </table>
-    </section>
-  </body>
-</document>
- 
diff --git a/site/src/site/xdoc/projects/sitedocs/maven-changes.xml b/site/src/site/xdoc/projects/sitedocs/maven-changes.xml
deleted file mode 100644
index 99c45a3..0000000
--- a/site/src/site/xdoc/projects/sitedocs/maven-changes.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: </title>
-  </properties> 
-  
-  <body>
-    <section name="Overview">
-      <p>
-        This project documents what is to be the umbrella website for all
-        Directory Project Sub-Projects.  There are a few rules and information
-        that is needed by Sub-Project developers in order to integrate/plugin
-        their Sub-Project documentation with this website.  
-      </p> 
-      
-      <p>
-        We use maven and the xdoc format to manage site documents and site
-        generation.  The layout for the top level site is managed here in this
-        project.  This is a subproject area which is where subproject content
-        is deposited.  In case this does not happen correctly some stubs have 
-        been left in place of the subproject.  Here's where we keep subproject
-        xdoc stubs:
-      </p>
-      <source>
-sitedocs/xdocs/subprjects
-    ./server
-    ./ldap     
-    ./authx
-    ./naming
-    ./asn1
-    ./kerberos
-    ./sitedocs
-      </source>
-      
-      <p>
-        Obviously, rather than use stubs, the sitedocs subproject area will 
-        contain actual content which this page is part of.  These directories
-        as mentioned before contain stubs.  When the top level site is generated
-        the html created is deposited int the target/docs directory of the 
-        sitedocs project directory here: 
-      </p>
-      
-      <source>directory/sitedocs/trunk/sitedocs/target/docs</source>
-      
-      <p>
-        It is the reponsibility of subprojects to generate their own content 
-        and copy it over to their appropriate directory within the subprojects
-        directory.  The Eve subproject for example does this using a post goal
-        within the maven.xml project like so to copy its site documentation:
-      </p>
-      
-      <source>
-  &lt;postGoal name="site"&gt;
-    &lt;attainGoal name="server:copy-images"/&gt;
-    &lt;attainGoal name="subproject:collectdocs"/&gt;
-  &lt;/postGoal&gt;
-
-  &lt;goal name="subproject:collectdocs"&gt;
-    &lt;copy toDir="../../../sitedocs/trunk/sitedocs/target/docs/subprojects/eve"&gt;
-      &lt;fileSet dir="${basedir}/target/docs"&gt;
-        &lt;include name="**"/&gt;
-      &lt;/fileSet&gt;
-    &lt;/copy&gt;
-  &lt;/goal&gt;
-      </source>
-      
-      <p>
-        This however is not the only requirement.  As we'll see to maintain
-        consistancy throughout the site subproject documentation needs to 
-        manage links, manage the same navigations, set properties in maven 
-        and its pom.
-      </p>
-    </section>
-    
-    <section name="Subproject Integration Howto">
-      <p>
-        At the present time there are stubs that have been placed
-        into the respective directories for the subprojects.  So under <b>
-        sitedocs/xdocs/subprojects</b> where subproject directories are 
-        contained a stub <b><em>index.xml</em></b> and <b><em>navigation.xml
-        </em></b> will be found.
-      </p>
-      
-      <p>
-        We have done this to prevent users from encountering broken links on the
-        site.  Once you have built your subproject's site and are sure it works
-        remove the respective stubs for your subproject.  If you do not do so
-        your content may be over written by the stubs if someone deploys the
-        top level site without generating your subproject's content.  So please
-        rm these stubs from the repository once your subproject is up. 
-      </p>
-      
-      <p>
-        Below we point out all the files and changes that need to be made in
-        order to make your subproject integrate into the top level site to
-        maintain a consistant look and feel.
-      </p>
-      
-      <subsection name="project.properties">
-        <p>
-          Add this to your maven project.properties at the top level of the 
-          project:
-        </p>
-        
-        <source>
-maven.xdoc.date=left
-maven.ui.banner.background=#FFFFFF
-maven.xdoc.includeProjectDocumentation=no
-maven.xdoc.poweredby.image=
-maven.xdoc.jsl = file:/${basedir}/../../../sitedocs/trunk/sitedocs/src/etc/site.jsl
-        </source>
-        
-        <p>
-          The last property is a relative reference to the 
-          <b>sitedocs/src/etc/site.jsl</b> file.  You can copy this if you want
-          into your own directory but I recommend you keep a reference since 
-          it effects the sense of site continuity and the general look and feel
-          that is carried along on every subproject.  There is no need to keep
-          them the same but it just might look better.  Copying the file and
-          versioning it in a subproject directory will allow the top and 
-          subproject sites to diverge.
-        </p>
-      </subsection>
-      
-      <subsection name="project.xml">
-        <p>
-          You have to make a couple of minor changes to the project.xml to make
-          the project and banner logos look the same on the TLP site and the 
-          subproject site.  Here's the set of tags and the values they should 
-          be set to in order to maintain consistancy:
-        </p>
-        
-        <source>
-&lt;name&gt;Apache Directory Project&lt;/name&gt;
-&lt;url&gt;http://incubator.apache.org/directory&lt;/url&gt;
-&lt;logo&gt;http://incubator.apache.org/directory/images/apache-directory-logo.png&lt;/logo&gt;
-
-&lt;organization&gt;
-  &lt;name&gt;Apache Incubator&lt;/name&gt;
-  &lt;url&gt;http://incubator.apache.org&lt;/url&gt;
-  &lt;logo&gt;http://incubator.apache.org/directory/images/apache-incubator-logo.png&lt;/logo&gt;
-&lt;/organization&gt;
-        </source>
-        
-        <p>
-          The first stanza above should set the alt hints and link for the 
-          project logo banner in the upper right hand corner using the following
-          graphic:
-        </p>
-        
-        <img src="http://incubator.apache.org/directory/images/apache-directory-logo.png"/>
-        
-        <p>
-          The second stanza sets the organization logo which for now is the 
-          Apache Incubator.  The organization logo appears at the upper right 
-          hand side, links to the incubator's main site and hold's alt hints
-          for the incubator.  The following graphic will appear for this logo:
-        </p>
-        
-        <img src="http://incubator.apache.org/directory/images/apache-incubator-logo.png"/>
-      </subsection>
-      
-      <subsection name="maven.xml">
-        <p>
-          Some scripting is required within the maven jelly scripting file for
-          your project.  As you may already know this maven.xml file sits at
-          your projects top level directory along side your project.xml file.
-          Here's what you have to add to it:
-        </p>
-        
-        <source>
-  &lt;postGoal name="site"&gt;
-    &lt;attainGoal name="subproject:collectdocs"/&gt;
-  &lt;/postGoal&gt;
-
-  &lt;goal name="subproject:collectdocs"&gt;
-    &lt;ant:copy toDir="../../../sitedocs/trunk/sitedocs/target/docs/subprojects/[subproject-name]"&gt;
-      &lt;ant:fileSet dir="${basedir}/target/docs"&gt;
-        &lt;ant:include name="**"/&gt;
-      &lt;/ant:fileSet&gt;
-    &lt;/ant:copy&gt;
-  &lt;/goal&gt;
-        </source>
-        
-        <p>
-          This Jelly code sets up a new goal to execute after the subproject's
-          site has been built.  It is called <em>subproject:collectdocs</em>.
-          Make sure you edit the toDir attribute value on the &lt;ant:copy&gt;
-          tag to use your subprojects destination directory.  It will copy the
-          generated output of your subproject site build under the sitedocs
-          directory in the respective position.
-        </p>
-      </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/projects/sitedocs/nav-template.txt b/site/src/site/xdoc/projects/sitedocs/nav-template.txt
deleted file mode 100644
index 0488ce5..0000000
--- a/site/src/site/xdoc/projects/sitedocs/nav-template.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project>
-
- <title>Apache Directory Project</title>
-
- <body>
-
-    <links>
-      <item name="Apache" href="http://apache.org/"/>
-      <item name="Directory" href="../../index.html"/>
-      <item name="Eve" href="/index.html"/>
-      <item name="LDAP" href="../ldap/index.html"/>
-      <item name="Naming" href="../naming/index.html"/>
-      <item name="Janus" href="../janus/index.html"/>
-      <item name="Snickers" href="../snickers/index.html"/>
-      <item name="Sitedocs" href="../sitedocs/index.html"/>
-    </links>
-
-    <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="Subprojects" href="../../subprojects/index.html">
-        <item name="Eve" href="/index.html"/>
-        <item name="LDAP" href="../ldap/index.html"/>
-        <item name="Janus" href="../janus/index.html"/>
-        <item name="Naming" href="../naming/index.html"/>
-        <item name="Snickers" href="../snickers/index.html"/>
-        <item name="Sitedocs" href="../sitedocs/index.html"/>
-      </item>
-      <item name="Documentation" href="../../doc/index.html"/>
-    </menu>
-
-    <menu name="Resources">
-      <item name="IRC" href="../../irc.html"/>
-      <item name="Jira" href=
-        "http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10400"/>
-      <item name="Wiki" href="http://wiki.apache.org/directory"/>
-      <item name="Lists" href="../../mailing-lists.html"/>
-      <item name="License" href="../../license.html"/>
-      <item name="Sandbox" href="../../sandbox/index.html"/>
-      <item name="Downloads" href="../../download.cgi"/>
-      <item name="Subversion" href="../../svn.html"/>
-      <item name="Related Projects" href="../../related/index.html"/>
-    </menu>
-
- </body>
-
-</project>
diff --git a/site/src/site/xdoc/projects/sitedocs/sitedoc-deployment.xml b/site/src/site/xdoc/projects/sitedocs/sitedoc-deployment.xml
deleted file mode 100644
index 35f1d87..0000000
--- a/site/src/site/xdoc/projects/sitedocs/sitedoc-deployment.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Apache Directory Project: </title>
-  </properties> 
-  
-  <body>
-    <section name="Deploying Site and Subprojects">
-      <subsection name="Incubator Site">
-        <p>
-          The entire Apache Incubator site is kept within CVS.  This includes 
-          generated files.  There has to be a good Apache Incubator resource 
-          for this in existance that explains how it is all organized.  Until 
-          I figure that out just follow along.
-        </p>
-        
-        <p>
-          Currently as a podling the Directory Project's resources are managed
-          under the Apache Incubator.  The website is no exception.  The 
-          specific incubator module used is the <b>incubator-directory</b> CVS
-          module.  I check it out like so:
-        </p>
-        
-        <source>
-cvs -d :ext:akarasulu@cvs.apache.org:/home/cvs co incubator-directory
-        </source>
-        
-        <p>
-          This module contains a content directory: <b>www</b>.  The final 
-          content under <b>www</b> is served up by the Apache servers.  The 
-          module's <b>www</b> folder is checked out daily into the following
-          directory on minotaur.apache.org: 
-          <b>/www/incubator.apache.org/directory</b>
-        </p>
-        
-        <p>
-          So all we have to do is generate the site out of our subversion 
-          working directory and copy the Maven generated content into the 
-          <b>www</b> folder of the CVS working copy for the incubator-directory
-          CVS module.  That's a mouth full.
-        </p>
-        
-        <p>
-          Once the generated content is copied, the changes are committed.  Then
-          deployers should ssh into minotaur and cd to the 
-          <b>/www/incubator.apache.org/directory</b> to do an update like so:
-        </p>
-        
-        <source>
-cd /www/incubator.apache.org/directory
-cvs update -d
-        </source>
-        
-        <p>
-          Everyone within our team has access to this area.  Anyone can deploy
-          the entire site or just a part of it this way.  It's a pretty neat 
-          setup and works well.
-        </p>
-        
-      </subsection>
-      
-      <subsection name="Building Top Level Project Site">
-        <p>
-          Keep in mind that the subprojects contain their own documentation.
-          They hook into the TLP Site.  The sitedocs project manages the TLP
-          site shell.  Any documentation that is not specific to a subproject
-          goes here.
-        </p>
-        
-        <p>
-          Building the top level project site is really simple.  You checkout
-          the sitedocs trunk form the subversion repository.  Add, delete or 
-          make changes to the xdocs that reside under the <b>xdocs</b> folder.
-          Once the changes are made run:
-        </p>
-        
-        <source>
-maven site          
-        </source>
-        
-        <p>
-          This will generate the TLP site right under <b>target/docs</b>.  
-          This does not generate the subproject content.  To do this you'll 
-          have to build the subproject documentation by using the same command 
-          on the respective subproject.   If all subprojects are configured as 
-          documented here in the subproject integration section above then the
-          subproject build should copy the generated subproject documents over 
-          to the respective <b>target/docs/subprojects/[subproject]</b> output 
-          folder of the sitedocs module.
-        </p>
-        
-        <p>
-          If you're changes are to the TLP only without changes to the 
-          subprojects then there is no need to build any subproject sites.  If
-          you want to deploy one or more subproject site changes then go ahead
-          and build the subproject site for every subproject module.  All the
-          results collect under the <b>sitedocs/target/docs</b> folder.  
-        </p>
-        
-        <p>
-          The contents of the <b>sitedocs/target/docs</b> folder is what is
-          copied over into the <b>incubator-directory/www</b> folder and 
-          committed into CVS.
-        </p>
-      </subsection>
-    </section>
-  </body>
-</document>
diff --git a/site/src/site/xdoc/thanks.xml b/site/src/site/xdoc/thanks.xml
deleted file mode 100644
index b696c12..0000000
--- a/site/src/site/xdoc/thanks.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <properties>
-    <author email="akarasulu@apache.org">Alex Karasulu</author>
-    <title>Special Thanks!</title>
-  </properties> 
-  
-  <body>
-
-    <section name="Special Thanks to ...">
-        <table>
-          <tr>
-            <th>Company</th>
-            <th>Donation Type</th>
-            <th>Corp. Contact</th>
-            <th>Apache Contact</th>
-          </tr>
-          <tr>
-            <td>JetBrains <img src="http://www.jetbrains.com/img/logo.gif"/></td>
-            <td>Licenses for IDEA</td>
-            <td>Ilia Dumov (Ilia.Dumov at jetbrains.com)</td>
-            <td>Alex Karasulu</td>
-          </tr>
-          <tr>
-            <td>YourKit <img src="http://www.yourkit.com/images/yjp_logo.gif"/></td>
-            <td>Licenses for YourKit</td>
-            <td>Vladimir Kondratyev (sales at yourkit.com)</td>
-            <td>Alex Karasulu</td>
-          </tr>
-          <tr>
-            <td>Placid Systems <img src="images/placid-systems-logo.png"/></td>
-            <td>Licenses for ANTLR Studio</td>
-            <td>Prashant Deva (pdeva at placidsystems.com)</td>
-            <td>Ersin Er</td>
-          </tr>
-        </table>
-    </section>
-  </body>
-</document>