directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vte...@apache.org
Subject svn commit: rev 22495 - in incubator/directory: eve/trunk janus/trunk janus/trunk/xdocs ldap/trunk naming/trunk rms/trunk sitedocs/trunk sitedocs/trunk/xdocs sitedocs/trunk/xdocs/community sitedocs/trunk/xdocs/community/history sitedocs/trunk/xdocs/community/process sitedocs/trunk/xdocs/community/who sitedocs/trunk/xdocs/doc sitedocs/trunk/xdocs/related sitedocs/trunk/xdocs/sandbox sitedocs/trunk/xdocs/subprojects sitedocs/trunk/xdocs/subprojects/eve sitedocs/trunk/xdocs/subprojects/janus sitedocs/trunk/xdocs/subprojects/ldap sitedocs/trunk/xdocs/subprojects/naming sitedocs/trunk/xdocs/subprojects/rms sitedocs/trunk/xdocs/subprojects/sitedocs sitedocs/trunk/xdocs/subprojects/snickers snickers/trunk
Date Sat, 03 Jul 2004 04:05:20 GMT
Author: vtence
Date: Fri Jul  2 21:05:19 2004
New Revision: 22495

Removed:
   incubator/directory/sitedocs/trunk/xdocs/subprojects/eve/
   incubator/directory/sitedocs/trunk/xdocs/subprojects/janus/
   incubator/directory/sitedocs/trunk/xdocs/subprojects/ldap/
   incubator/directory/sitedocs/trunk/xdocs/subprojects/naming/
   incubator/directory/sitedocs/trunk/xdocs/subprojects/rms/
   incubator/directory/sitedocs/trunk/xdocs/subprojects/snickers/
Modified:
   incubator/directory/eve/trunk/maven.xml
   incubator/directory/eve/trunk/project.properties
   incubator/directory/eve/trunk/project.xml
   incubator/directory/janus/trunk/maven.xml
   incubator/directory/janus/trunk/project.properties
   incubator/directory/janus/trunk/project.xml
   incubator/directory/janus/trunk/xdocs/index.xml
   incubator/directory/ldap/trunk/maven.xml
   incubator/directory/ldap/trunk/project.properties
   incubator/directory/naming/trunk/project.properties
   incubator/directory/rms/trunk/maven.xml
   incubator/directory/rms/trunk/project.properties
   incubator/directory/sitedocs/trunk/project.properties
   incubator/directory/sitedocs/trunk/xdocs/community/history/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/community/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/community/process/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/community/who/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/doc/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/index.xml
   incubator/directory/sitedocs/trunk/xdocs/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/related/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/sandbox/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/subprojects/navigation.xml
   incubator/directory/sitedocs/trunk/xdocs/subprojects/sitedocs/navigation.xml
   incubator/directory/snickers/trunk/maven.xml
   incubator/directory/snickers/trunk/project.properties
Log:
First cut at using multiproject plugin to build the web site. Some links might not function properly in subprojects. Need to review each sub-project 1 by 1

Modified: incubator/directory/eve/trunk/maven.xml
==============================================================================
--- incubator/directory/eve/trunk/maven.xml	(original)
+++ incubator/directory/eve/trunk/maven.xml	Fri Jul  2 21:05:19 2004
@@ -15,19 +15,8 @@
   
   <postGoal name="site">
     <attainGoal name="server:copy-images"/>
-    <attainGoal name="subproject:collectdocs"/>
   </postGoal>
 
-  <goal name="subproject:collectdocs">
-    <ant:copy 
-      toDir="../../sitedocs/trunk/target/docs/subprojects/eve">
-      
-      <ant:fileSet dir="${basedir}/target/docs">
-        <ant:include name="**"/>
-      </ant:fileSet>
-    </ant:copy>
-  </goal>
-
   <goal name="server:copy-images">
     <copy toDir="target/docs/images">
       <fileSet dir="${basedir}/src/images">
@@ -48,7 +37,8 @@
       includes="**/project.xml" excludes="./project.xml" goals="jar:deploy" 
       banner="Deploying" ignoreFailures="false"/>
   </goal>
-  
+
+  <!-- Is this useful anymore? (Vincent) -->
   <goal name="sitedocs" description="Builds the entire site documentation">
     <maven:reactor basedir="${basedir}" postProcessing="true" 
       includes="**/project.xml" excludes="./project.xml" goals="site" 

Modified: incubator/directory/eve/trunk/project.properties
==============================================================================
--- incubator/directory/eve/trunk/project.properties	(original)
+++ incubator/directory/eve/trunk/project.properties	Fri Jul  2 21:05:19 2004
@@ -1,10 +1,8 @@
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-maven.license.licenseFile=../../../LICENSE.txt
+maven.license.licenseFile=../../LICENSE.txt
 maven.xdoc.date=left
-maven.ui.banner.background=#FFFFFF
 maven.xdoc.includeProjectDocumentation=no
 maven.xdoc.poweredby.image=
-maven.xdoc.jsl = file:/${basedir}/../../sitedocs/trunk/src/etc/site.jsl
 
 #
 # remote repository properties

Modified: incubator/directory/eve/trunk/project.xml
==============================================================================
--- incubator/directory/eve/trunk/project.xml	(original)
+++ incubator/directory/eve/trunk/project.xml	Fri Jul  2 21:05:19 2004
@@ -2,7 +2,7 @@
 
 <project>
     <groupId>incubator-directory</groupId>
-    <id>eve-directory-server</id>
+    <id>eve</id>
     <name>Eve Directory Server</name>
     <version>SNAPSHOT</version>
     

Modified: incubator/directory/janus/trunk/maven.xml
==============================================================================
--- incubator/directory/janus/trunk/maven.xml	(original)
+++ incubator/directory/janus/trunk/maven.xml	Fri Jul  2 21:05:19 2004
@@ -1,26 +1,14 @@
-<project default="all"
+<project default="build-all"
     xmlns:maven="jelly:maven"
     xmlns:deploy="deploy">
 
-    <postGoal name="site">
-      <attainGoal name="collect-docs"/>
-    </postGoal>
-
-    <goal name="collect-docs">
-      <copy toDir="../../sitedocs/trunk/target/docs/subprojects/janus">
-        <fileset dir="${basedir}/target/docs">
-          <include name="**"/>
-        </fileset>
-      </copy>
-    </goal>
-    
-    <goal name="all"
+    <goal name="build-all"
         description="Builds all the sub-projects.">
 
         <maven:reactor
             basedir="${basedir}"
             includes="core/*/project.xml,script/project.xml"
-            goals="install:jar"
+            goals="jar:install"
             banner="Building sub-project:"
             ignoreFailures="false"/>
     </goal>

Modified: incubator/directory/janus/trunk/project.properties
==============================================================================
--- incubator/directory/janus/trunk/project.properties	(original)
+++ incubator/directory/janus/trunk/project.properties	Fri Jul  2 21:05:19 2004
@@ -1,8 +1,10 @@
+# Remote repositories
 maven.repo.remote = http://www.ibiblio.org/maven, http://dist.codehaus.org
 
+# Report plugins
+maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
+maven.license.licenseFile=../../LICENSE.txt
+
 # Site generation
-maven.xdoc.date = left
-maven.ui.banner.background = #FFFFFF
-maven.xdoc.includeProjectDocumentation = no
-maven.xdoc.poweredby.image =
-maven.xdoc.jsl = file:${basedir}/../../sitedocs/trunk/src/etc/site.jsl
+maven.xdoc.includeProjectDocumentation=no
+maven.xdoc.poweredby.image=
\ No newline at end of file

Modified: incubator/directory/janus/trunk/project.xml
==============================================================================
--- incubator/directory/janus/trunk/project.xml	(original)
+++ incubator/directory/janus/trunk/project.xml	Fri Jul  2 21:05:19 2004
@@ -1,58 +1,27 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project>
     <groupId>directory</groupId>
-    <name>Janus AAA Framework</name>
-    <package>org.apache.janus</package>
+    <artifactId>janus</artifactId>
     <currentVersion>0.1-SNAPSHOT</currentVersion>
-
+    <name>Janus</name>
+    <package>org.apache.janus</package>
+    <shortDescription>Janus Authentication, Authorization and Accounting Framework</shortDescription>
+    <description>
+    The Janus subproject attempts to provide a generic, flexible and extensible security
+    framework to the Directory project. It provides Authentication, Authorization and Accounting
+    facilities. The framework is designed around a pluggable architecture to give greater flexibility
+    and leverage existing AAA insfrastructures.
+    </description>
     <inceptionYear>2003</inceptionYear>
 
-    <name>Apache Directory Project</name>
     <url>http://incubator.apache.org/directory</url>
     <logo>http://incubator.apache.org/directory/images/apache-directory-logo.png</logo>
-
     <organization>
       <name>Apache Incubator</name>
       <url>http://incubator.apache.org</url>
       <logo>http://incubator.apache.org/directory/images/apache-incubator-logo.png</logo>
     </organization>
-
-    <issueTrackingUrl>http://nagoya.apache.org/jira/secure/BrowseProject.jspa?id=10400</issueTrackingUrl>
-    <siteAddress>directory.apache.org</siteAddress>
-
-    <shortDescription>Janus Authentication, Authorization and Accounting Framework</shortDescription>
-
-    <description>
-    The Janus subproject attempts to provide a generic, flexible and extensible security
-    framework to the Directory project. It provides Authentication, Authorization and Accounting
-    facilities. The framework is designed around a pluggable architecture to give greater flexibility
-    and leverage existing AAA insfrastructures.
-    </description>
-
-    <mailingLists>
-        <mailingList>
-            <name>Apache Directory Developement - use [janus] prefix</name>
-            <subscribe>
-            directory-dev-subscribe@incubator.apache.org
-            </subscribe>
-            <unsubscribe>
-            directory-dev-unsubscribe@incubator.apache.org
-            </unsubscribe>
-            <archive>
-            http://nagoya.apache.org/eyebrowse/SummarizeList?listId=181
-            </archive>
-        </mailingList>
-    </mailingLists>
-
-    <licenses>
-      <license>
-        <name>Apache 2.0 License</name>
-        <url>
-        http://cvs.apache.org/viewcvs.cgi/incubator/directory/LICENSE.txt
-        </url>
-        <distribution>repo</distribution>
-      </license>
-    </licenses>
+    <issueTrackingUrl>http://nagoya.apache.org/jira/browse/DIRJANUS</issueTrackingUrl>
 
     <dependencies>
         <dependency>
@@ -100,7 +69,7 @@
                 </excludes>
             </resource>
             <resource>
-                <directory>${basedir}/../</directory>
+                <directory>${basedir}/../..</directory>
                 <includes>
                     <include>LICENSE.txt</include>
                 </includes>

Modified: incubator/directory/janus/trunk/xdocs/index.xml
==============================================================================
--- incubator/directory/janus/trunk/xdocs/index.xml	(original)
+++ incubator/directory/janus/trunk/xdocs/index.xml	Fri Jul  2 21:05:19 2004
@@ -1,116 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-    <properties>
-        <author email="vtence@apache.org">Vincent Tence</author>
-        <title>Apache Directory Project: Janus Security Framework</title>
-    </properties>
-
-    <body>
-        <section name="Overview">
-            <p>
-        Janus is an effort to develop an Authentication, Authorization and Accounting framework for
-        building security infrastructures.
-            </p>
-            <p>
-        Security is a broad and complex domain, which refers to ways of protecting sensitive
-        resources from unauthorized access. This is usually done with a combination of authentication
-        - to prove an individual's identity -, and authorization - to grant or deny an operation on a resource.
-        Most security measures also involves some form of cryptography: secure digests to preserve data integrity,
-        data encryption mechanisms to protect data
-        access from individuals without proper authorization and digital signatures to prove authenticity of some sort.
-            </p>
-        </section>
-
-        <section name="Goals">
-            <p>
-        Janus is an attempt to provide a framework for developing complex security infrastructures.
-        It addresses the Authentication, Authorization and Accounting concerns of secure applications or systems.
-            </p>
-            <p>
-        Janus tries to define proper abstractions for security concepts to be a generic and flexible security framework
-        on top of which complex secure applications can be built. It does not deal with cryptography mechanisms,
-        since cryptography is a mean of attaining security goals. Yet, since Janus has been thought to be flexible,
-        it is easy to plug-in your own implementations of Janus abstractions to use cryptography for instance.
-            </p>
-        </section>
-
-        <section name="Features">
-            <p>
-        The Janus sub-project defines the Janus security framework and provides default implementations of authentication,
-        authorization and accounting components.
-
-        We believe Janus has some unique features that set it apart from existing solutions:
-                <ul>
-                    <li>Plain Java Object framework</li>
-                    <li>Core has no dependency</li>
-                    <li>IoC friendly (our favorite pattern)</li>
-                    <li>Test-Driven developed</li>
-                    <li>No coupling with some logging framework you don't want</li>
-                    <li>Tested so you don't have to do it</li>
-                    <li>Modular design - Use what you need, no more</li>
-                </ul>
-            </p>
-        </section>
-
-        <section name="Roadmap">
-            <p>
-        Janus is already stable enough to build simple application security. Here's what we're currently targetting:
-                <ul>
-                    <li>Username/password basic authentication (done)</li>
-                    <li>Role based access control (done)</li>
-                    <li>XML security realm for use with username/password authentication (done)</li>
-                    <li>XML security policy for use with role-based access control (done)</li>
-                    <li>Groups of principals (to come)</li>
-                    <li>Role hierarchies (to come)</li>
-                    <li>RDMS security realm (to come)</li>
-                    <li>RDMS security policy (to come)</li>
-                    <li>LDAP security realm (to come)</li>
-                    <li>LDAP security policy (to come)</li>
-                    <li>Dynamic separation of duties (planned)</li>
-                    <li>Accounting (planned)</li>
-                </ul>
-            </p>
-        </section>
-
-        <section name="Security">
-
-            <subsection name="Authentication">
-                <p>
-        Authentication is the process of validating an individual's identity. It's about finding out
-        if an individual is who he/she claims to be.
-
-        This is done by presenting some proof of identity, which usually can take the form of username/password,
-        digital signature, etc. The idea is that each individual can be recognized by unique information that
-        differentiates him or her from other individuals.
-                </p>
-            </subsection>
-
-            <subsection name="Authorization">
-                <p>
-        Authorization is about, once a user has been authenticated, determining if
-        hs/she is authorized to do something. A successful authorization results in the user
-        being granted the permission to perform an operation on a resource. A failed authorization will
-        result in the denial of the same permission.
-                </p>
-<!--
-                <subsection name="Role-Based Access Control">
-                </subsection>
-
-                <subsection name="Users and Roles"></subsection>
-
-                <subsection name="Roles and Permissions"></subsection>
-
-                <subsection name="Traditional Access Control Technologies">
-                </subsection>
-
-                <subsection name="Advantages of Role-Based Access Control"></subsection>
-                -->
-            </subsection>
-            <subsection name="Accounting">
-                <p>
-        Accounting is the concern of collecting resource access/consumption data for the purposes of auditing.
-                </p>
-            </subsection>
-        </section>
-    </body>
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+    <properties>
+        <author email="vtence@apache.org">Vincent Tence</author>
+        <title>Overview</title>
+    </properties>
+
+    <body>
+        <section name="Introduction">
+            <p>
+        Janus is an effort to develop an Authentication, Authorization and Accounting framework for
+        building security infrastructures.
+            </p>
+        </section>
+        
+        <section name="Vision">
+            <p>
+        Janus is an attempt to provide a framework for developing complex security infrastructures.
+        It addresses the Authentication, Authorization and Accounting concerns of secure applications or systems.
+            </p>
+            <p>
+        Janus tries to define proper abstractions for security concepts to be a generic and flexible security framework
+        on top of which complex secure applications can be built. It does not deal with cryptography mechanisms,
+        since cryptography is a mean of attaining security goals. Yet, since Janus has been thought to be flexible,
+        it is easy to plug-in your own implementations of Janus abstractions.
+            </p>
+        </section>
+        
+        <section name="Features">
+            <p>
+        The Janus sub-project defines the Janus security framework and provides default implementations of authentication,
+        authorization and accounting components.
+
+        We believe Janus has some unique features that set it apart from existing solutions:
+                <ul>
+                    <li>Plain Java Object framework</li>
+                    <li>Core has no dependency</li>
+                    <li>IoC friendly (our favorite pattern)</li>
+                    <li>Test-Driven developed</li>
+                    <li>No coupling with some logging framework you don't want</li>
+                    <li>Tested so you don't have to do it</li>
+                    <li>Modular design - Use what you need, no more</li>
+                </ul>
+            </p>
+        </section>
+    </body>
 </document>

Modified: incubator/directory/ldap/trunk/maven.xml
==============================================================================
--- incubator/directory/ldap/trunk/maven.xml	(original)
+++ incubator/directory/ldap/trunk/maven.xml	Fri Jul  2 21:05:19 2004
@@ -8,16 +8,7 @@
   
   <postGoal name="site">
     <attainGoal name="server:copy-images"/>
-    <attainGoal name="subproject:collectdocs"/>
   </postGoal>
-
-  <goal name="subproject:collectdocs">
-    <ant:copy toDir="../../sitedocs/trunk/target/docs/subprojects/ldap">
-      <ant:fileSet dir="${basedir}/target/docs">
-        <ant:include name="**"/>
-      </ant:fileSet>
-    </ant:copy>
-  </goal>
 
   <goal name="server:copy-images">
     <copy toDir="target/docs/images">

Modified: incubator/directory/ldap/trunk/project.properties
==============================================================================
--- incubator/directory/ldap/trunk/project.properties	(original)
+++ incubator/directory/ldap/trunk/project.properties	Fri Jul  2 21:05:19 2004
@@ -1,10 +1,8 @@
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
 maven.license.licenseFile=../../LICENSE.txt
 maven.xdoc.date=left
-maven.ui.banner.background=#FFFFFF
-maven.xdoc.includeProjectDocumentation=no
 maven.xdoc.poweredby.image=
-maven.xdoc.jsl = file:/${basedir}/../../sitedocs/trunk/src/etc/site.jsl
+maven.xdoc.includeProjectDocumentation=no
 
 #
 # remote repository properties

Modified: incubator/directory/naming/trunk/project.properties
==============================================================================
--- incubator/directory/naming/trunk/project.properties	(original)
+++ incubator/directory/naming/trunk/project.properties	Fri Jul  2 21:05:19 2004
@@ -1,7 +1,8 @@
 maven.checkstyle.properties=checkstyle.xml
 maven.junit.fork=true
 maven.xdoc.date = left
-maven.xdoc.poweredby.image=maven-feather.png
+maven.xdoc.poweredby.image=
+
 maven.multiproject.ignoreFailures=false
 maven.multiproject.navigation=aggregate
 maven.multiproject.type=jar

Modified: incubator/directory/rms/trunk/maven.xml
==============================================================================
--- incubator/directory/rms/trunk/maven.xml	(original)
+++ incubator/directory/rms/trunk/maven.xml	Fri Jul  2 21:05:19 2004
@@ -11,18 +11,7 @@
 
   <postGoal name="site">
     <attainGoal name="server:copy-images"/>
-    <attainGoal name="subproject:collectdocs"/>
   </postGoal>
-
-  <goal name="subproject:collectdocs">
-    <ant:copy
-      toDir="../../sitedocs/trunk/target/docs/subprojects/rms">
-
-      <ant:fileSet dir="${basedir}/target/docs">
-        <ant:include name="**"/>
-      </ant:fileSet>
-    </ant:copy>
-  </goal>
 
   <goal name="ideaall">
      <attainGoal name="idea:multiproject"/>

Modified: incubator/directory/rms/trunk/project.properties
==============================================================================
--- incubator/directory/rms/trunk/project.properties	(original)
+++ incubator/directory/rms/trunk/project.properties	Fri Jul  2 21:05:19 2004
@@ -7,7 +7,6 @@
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
 maven.license.licenseFile=../../../LICENSE.txt
 maven.xdoc.date=left
-maven.ui.banner.background=#FFFFFF
 maven.xdoc.includeProjectDocumentation=no
 maven.xdoc.poweredby.image=
 

Modified: incubator/directory/sitedocs/trunk/project.properties
==============================================================================
--- incubator/directory/sitedocs/trunk/project.properties	(original)
+++ incubator/directory/sitedocs/trunk/project.properties	Fri Jul  2 21:05:19 2004
@@ -1,5 +1,9 @@
 maven.xdoc.date=left
-maven.ui.banner.background=#FFFFFF
 maven.xdoc.includeProjectDocumentation=no
 maven.xdoc.poweredby.image=
-maven.xdoc.jsl = ./src/etc/site.jsl
+
+maven.multiproject.basedir = ${basedir}/../..
+maven.multiproject.excludes = sitedocs/*/project.xml
+maven.multiproject.includes = */trunk/project.xml
+maven.multiproject.aggregateDir = subprojects/
+

Modified: incubator/directory/sitedocs/trunk/xdocs/community/history/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/community/history/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/community/history/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -11,8 +11,8 @@
       <item name="Directory" href="/index.html"/>
       <item name="Eve" href="/subprojects/eve/index.html"/>
       <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
       <item name="Janus" href="/subprojects/janus/index.html"/>
       <item name="Snickers" href="/subprojects/snickers/index.html"/>
       <item name="Sitedocs" href="/subprojects/sitedocs/index.html"/>

Modified: incubator/directory/sitedocs/trunk/xdocs/community/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/community/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/community/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -11,8 +11,8 @@
       <item name="Directory" href="/index.html"/>
       <item name="Eve" href="/subprojects/eve/index.html"/>
       <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
       <item name="Janus" href="/subprojects/janus/index.html"/>
       <item name="Snickers" href="/subprojects/snickers/index.html"/>
       <item name="Sitedocs" href="/subprojects/sitedocs/index.html"/>

Modified: incubator/directory/sitedocs/trunk/xdocs/community/process/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/community/process/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/community/process/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -1,57 +1,57 @@
-<?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="/subprojects/eve/index.html"/>
-      <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
-      <item name="Janus" href="/subprojects/janus/index.html"/>
-      <item name="Snickers" href="/subprojects/snickers/index.html"/>
-      <item name="Sitedocs" href="/subprojects/sitedocs/index.html"/>
-    </links>
-
-    <menu name="About Directory">
-      <item name="Overview" href="/index.html"/>
-      <item name="Community" href="/community/index.html">
-        <item name="Who We Are" href="/community/who/index.html"/>
-        <item name="Process" href="/community/process/index.html">
-          <item name="Project Charter" href="/community/process/mission.html"/>
-          <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"/>
-      </item>
-      <item name="Latest News" href="/news.html"/>
-      <item name="Subprojects" href="/subprojects/index.html"/>
-      <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>
+<?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="/subprojects/eve/index.html"/>
+      <item name="RMS" href="/subprojects/rms/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
+      <item name="Janus" href="/subprojects/janus/index.html"/>
+      <item name="Snickers" href="/subprojects/snickers/index.html"/>
+      <item name="Sitedocs" href="/subprojects/sitedocs/index.html"/>
+    </links>
+
+    <menu name="About Directory">
+      <item name="Overview" href="/index.html"/>
+      <item name="Community" href="/community/index.html">
+        <item name="Who We Are" href="/community/who/index.html"/>
+        <item name="Process" href="/community/process/index.html">
+          <item name="Project Charter" href="/community/process/mission.html"/>
+          <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"/>
+      </item>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Subprojects" href="/subprojects/index.html"/>
+      <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>

Modified: incubator/directory/sitedocs/trunk/xdocs/community/who/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/community/who/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/community/who/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -11,8 +11,8 @@
       <item name="Directory" href="/index.html"/>
       <item name="Eve" href="/subprojects/eve/index.html"/>
       <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
       <item name="Janus" href="/subprojects/janus/index.html"/>
       <item name="Snickers" href="/subprojects/snickers/index.html"/>
       <item name="Sitedocs" href="/subprojects/sitedocs/index.html"/>

Modified: incubator/directory/sitedocs/trunk/xdocs/doc/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/doc/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/doc/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -1,47 +1,47 @@
-<?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="/subprojects/eve/index.html"/>
-      <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
-      <item name="Janus" href="/subprojects/janus/index.html"/>
-      <item name="Snickers" href="/subprojects/snickers/index.html"/>
-      <item name="Sitedocs" href="/subprojects/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="Documentation" href="/doc/index.html">
-        <item name="Wiki" href="/doc/wiki.html"/>
-        <item name="Articles" href="/doc/articles.html"/>
-      </item>
-    </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>
+<?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="/subprojects/eve/index.html"/>
+      <item name="RMS" href="/subprojects/rms/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
+      <item name="Janus" href="/subprojects/janus/index.html"/>
+      <item name="Snickers" href="/subprojects/snickers/index.html"/>
+      <item name="Sitedocs" href="/subprojects/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="Documentation" href="/doc/index.html">
+        <item name="Wiki" href="/doc/wiki.html"/>
+        <item name="Articles" href="/doc/articles.html"/>
+      </item>
+    </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>

Modified: incubator/directory/sitedocs/trunk/xdocs/index.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/index.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/index.xml	Fri Jul  2 21:05:19 2004
@@ -50,6 +50,9 @@
       </p>
     </section>
     
+    <!-- This section duplicates subprojects/index.xml. 
+    Not sure we should allow this kind of duplication. I fear we might end up with broken links.
+    
     <section name="Subprojects">
       <table>
         <tr><th>Subproject</th><th>Description</th></tr>
@@ -65,7 +68,7 @@
         </tr>
 
         <tr>
-          <td><a href="subprojects/ldap/index.html">LDAP</a></td>
+          <td><a href="subprojects/directory-ldap/index.html">LDAP</a></td>
           <td>
             Commons code dealing with the Lightweight Directory Access Protocol
             is managed under this subproject.  This will include a common API 
@@ -88,7 +91,7 @@
         </tr>
 
         <tr>
-          <td><a href="subprojects/naming/index.html">Naming</a></td>
+          <td><a href="subprojects/directory-naming/index.html">Naming</a></td>
           <td>
             There is a set of core functionality common to all JNDI providers 
             and JNDI does not necessarily revolve around LDAP and X.500 
@@ -127,5 +130,6 @@
         </tr>
       </table>
     </section>
+    -->
   </body>
 </document>

Modified: incubator/directory/sitedocs/trunk/xdocs/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -11,8 +11,8 @@
       <item name="Directory" href="/index.html"/>
       <item name="Eve" href="/subprojects/eve/index.html"/>
       <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
       <item name="Janus" href="/subprojects/janus/index.html"/>
       <item name="Snickers" href="/subprojects/snickers/index.html"/>
       <item name="Sitedocs" href="/subprojects/sitedocs/index.html"/>

Modified: incubator/directory/sitedocs/trunk/xdocs/related/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/related/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/related/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -1,55 +1,55 @@
-<?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="/subprojects/eve/index.html"/>
-      <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
-      <item name="Janus" href="/subprojects/janus/index.html"/>
-      <item name="Snickers" href="/subprojects/snickers/index.html"/>
-      <item name="Sitedocs" href="/subprojects/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="Documentation" href="/doc/index.html"/>
-    </menu>
-
-    <menu name="About Directory">
-      <item name="Overview" href="/index.html"/>
-      <item name="Latest News" href="/news.html"/>
-      <item name="Community" href="/community/index.html"/>
-      <item name="Products" href="/product/index.html"/>
-      <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">
-        <item name="Apache" href="/related/apache.html"/>
-        <item name="External" href="/related/external.html"/>
-        <item name="Powered-By" href="/related/powered.html"/>
-      </item>
-    </menu>
- </body>
-
-</project>
+<?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="/subprojects/eve/index.html"/>
+      <item name="RMS" href="/subprojects/rms/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
+      <item name="Janus" href="/subprojects/janus/index.html"/>
+      <item name="Snickers" href="/subprojects/snickers/index.html"/>
+      <item name="Sitedocs" href="/subprojects/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="Documentation" href="/doc/index.html"/>
+    </menu>
+
+    <menu name="About Directory">
+      <item name="Overview" href="/index.html"/>
+      <item name="Latest News" href="/news.html"/>
+      <item name="Community" href="/community/index.html"/>
+      <item name="Products" href="/product/index.html"/>
+      <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">
+        <item name="Apache" href="/related/apache.html"/>
+        <item name="External" href="/related/external.html"/>
+        <item name="Powered-By" href="/related/powered.html"/>
+      </item>
+    </menu>
+ </body>
+
+</project>

Modified: incubator/directory/sitedocs/trunk/xdocs/sandbox/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/sandbox/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/sandbox/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -1,43 +1,43 @@
-<?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="/subprojects/eve/index.html"/>
-      <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
-      <item name="Janus" href="/subprojects/janus/index.html"/>
-      <item name="Snickers" href="/subprojects/snickers/index.html"/>
-      <item name="Sitedocs" href="/subprojects/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="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>
+<?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="/subprojects/eve/index.html"/>
+      <item name="RMS" href="/subprojects/rms/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
+      <item name="Janus" href="/subprojects/janus/index.html"/>
+      <item name="Snickers" href="/subprojects/snickers/index.html"/>
+      <item name="Sitedocs" href="/subprojects/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="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>

Modified: incubator/directory/sitedocs/trunk/xdocs/subprojects/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/subprojects/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/subprojects/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -1,51 +1,51 @@
-<?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="/subprojects/eve/index.html"/>
-      <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
-      <item name="Janus" href="/subprojects/janus/index.html"/>
-      <item name="Snickers" href="/subprojects/snickers/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="/subprojects/eve/index.html"/>
-        <item name="RMS" href="/subprojects/rms/index.html"/>
-        <item name="LDAP" href="/subprojects/ldap/index.html"/>
-        <item name="Janus" href="/subprojects/janus/index.html"/>
-        <item name="Naming" href="/subprojects/naming/index.html"/>
-        <item name="Snickers" href="/subprojects/snickers/index.html"/>
-        <item name="Sitedocs" href="/subprojects/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>
+<?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="/subprojects/eve/index.html"/>
+      <item name="RMS" href="/subprojects/rms/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
+      <item name="Janus" href="/subprojects/janus/index.html"/>
+      <item name="Snickers" href="/subprojects/snickers/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="/subprojects/eve/index.html"/>
+        <item name="RMS" href="/subprojects/rms/index.html"/>
+        <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+        <item name="Janus" href="/subprojects/janus/index.html"/>
+        <item name="Naming" href="/subprojects/directory-naming/index.html"/>
+        <item name="Snickers" href="/subprojects/snickers/index.html"/>
+        <item name="Sitedocs" href="/subprojects/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>

Modified: incubator/directory/sitedocs/trunk/xdocs/subprojects/sitedocs/navigation.xml
==============================================================================
--- incubator/directory/sitedocs/trunk/xdocs/subprojects/sitedocs/navigation.xml	(original)
+++ incubator/directory/sitedocs/trunk/xdocs/subprojects/sitedocs/navigation.xml	Fri Jul  2 21:05:19 2004
@@ -1,56 +1,56 @@
-<?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="/subprojects/eve/index.html"/>
-      <item name="RMS" href="/subprojects/rms/index.html"/>
-      <item name="LDAP" href="/subprojects/ldap/index.html"/>
-      <item name="Naming" href="/subprojects/naming/index.html"/>
-      <item name="Janus" href="/subprojects/janus/index.html"/>
-      <item name="Snickers" href="/subprojects/snickers/index.html"/>
-      <item name="Sitedocs" href="/subprojects/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="/subprojects/eve/index.html"/>
-        <item name="RMS" href="/subprojects/rms/index.html"/>
-        <item name="LDAP" href="/subprojects/ldap/index.html"/>
-        <item name="Janus" href="/subprojects/janus/index.html"/>
-        <item name="Naming" href="/subprojects/naming/index.html"/>
-        <item name="Snickers" href="/subprojects/snickers/index.html"/>
-        <item name="Sitedocs" href="/subprojects/sitedocs/index.html">
-          <item name="Maven Changes" href="/subprojects/sitedocs/maven-changes.html"/>
-          <item name="Hyperlink Management" href="/subprojects/sitedocs/hyperlink-management.html"/>
-          <item name="Sitedoc Deployment" href="/subprojects/sitedocs/sitedoc-deployment.html"/>
-        </item>
-      </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>
+<?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="/subprojects/eve/index.html"/>
+      <item name="RMS" href="/subprojects/rms/index.html"/>
+      <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+      <item name="Naming" href="/subprojects/directory-naming/index.html"/>
+      <item name="Janus" href="/subprojects/janus/index.html"/>
+      <item name="Snickers" href="/subprojects/snickers/index.html"/>
+      <item name="Sitedocs" href="/subprojects/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="/subprojects/eve/index.html"/>
+        <item name="RMS" href="/subprojects/rms/index.html"/>
+        <item name="LDAP" href="/subprojects/directory-ldap/index.html"/>
+        <item name="Janus" href="/subprojects/janus/index.html"/>
+        <item name="Naming" href="/subprojects/directory-naming/index.html"/>
+        <item name="Snickers" href="/subprojects/snickers/index.html"/>
+        <item name="Sitedocs" href="/subprojects/sitedocs/index.html">
+          <item name="Maven Changes" href="/subprojects/sitedocs/maven-changes.html"/>
+          <item name="Hyperlink Management" href="/subprojects/sitedocs/hyperlink-management.html"/>
+          <item name="Sitedoc Deployment" href="/subprojects/sitedocs/sitedoc-deployment.html"/>
+        </item>
+      </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>

Modified: incubator/directory/snickers/trunk/maven.xml
==============================================================================
--- incubator/directory/snickers/trunk/maven.xml	(original)
+++ incubator/directory/snickers/trunk/maven.xml	Fri Jul  2 21:05:19 2004
@@ -16,18 +16,7 @@
   
   <postGoal name="site">
     <attainGoal name="server:copy-images"/>
-    <attainGoal name="subproject:collectdocs"/>
   </postGoal>
-
-  <goal name="subproject:collectdocs">
-    <ant:copy 
-      toDir="../../sitedocs/trunk/target/docs/subprojects/snickers">
-      
-      <ant:fileSet dir="${basedir}/target/docs">
-        <ant:include name="**"/>
-      </ant:fileSet>
-    </ant:copy>
-  </goal>
 
   <goal name="server:copy-images">
     <copy toDir="target/docs/images">

Modified: incubator/directory/snickers/trunk/project.properties
==============================================================================
--- incubator/directory/snickers/trunk/project.properties	(original)
+++ incubator/directory/snickers/trunk/project.properties	Fri Jul  2 21:05:19 2004
@@ -11,16 +11,13 @@
 tag2.enabled=false
 tag2.scope=all
 
-maven.license.licenseFile=../../../LICENSE.txt
 #maven.clover.instrument.tests=true
 maven.junit.fork=true
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
-maven.license.licenseFile=../../../LICENSE.txt
+maven.license.licenseFile=../../LICENSE.txt
 maven.xdoc.date=left
-maven.ui.banner.background=#FFFFFF
 maven.xdoc.includeProjectDocumentation=no
 maven.xdoc.poweredby.image=
-#maven.xdoc.jsl = file:/${basedir}/../../sitedocs/trunk/src/etc/site.jsl
 
 #
 # remote repository properties

Mime
View raw message