From 1d053c4e68d644321d0c665db64e3c74a09d6595 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Thu, 26 May 2011 08:33:56 +0000
Subject: [PATCH] Add mention of CCPL, one-line descriptions for toolkit, smaller left menu
---
opendj3/opendj-ldap-sdk-examples/src/site/xdoc/index.xml | 4
opendj3/opendj-ldap-sdk/src/site/xdoc/index.xml | 4
opendj3/opendj-ldap-toolkit/src/site/xdoc/index.xml | 13 +++
opendj3/src/site/xdoc/docs.xml | 4
opendj3/opendj-ldap-toolkit/src/site/site.xml | 12 ++--
opendj3/opendj-ldap-sdk/src/site/site.xml | 12 ++--
opendj3/opendj-ldap-sdk-examples/src/site/site.xml | 12 ++--
opendj3/src/site/xdoc/404.xml | 40 +++++++++++++
opendj3/src/site/site.xml | 21 +++---
opendj3/pom.xml | 14 ++++
10 files changed, 100 insertions(+), 36 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk-examples/src/site/site.xml b/opendj3/opendj-ldap-sdk-examples/src/site/site.xml
index 8152eb4..bb9b608 100644
--- a/opendj3/opendj-ldap-sdk-examples/src/site/site.xml
+++ b/opendj3/opendj-ldap-sdk-examples/src/site/site.xml
@@ -10,7 +10,7 @@
! Suite 900, Mountain View, California, 94041, USA.
!
! You can also obtain a copy of the license at
- ! src/main/resources/legal-notices/CC-BY-NC-ND.txt.
+ ! trunk/opendj3/legal-notices/CC-BY-NC-ND.txt.
! See the License for the specific language governing permissions
! and limitations under the License.
!
@@ -40,14 +40,14 @@
<item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
</menu>
- <menu name="Modules">
- <item name="OpenDJ LDAP SDK" href="../opendj-ldap-sdk" />
- <item name="OpenDJ LDAP SDK Examples" href="index.html" />
- <item name="OpenDJ LDAP Toolkit" href="../opendj-ldap-toolkit" />
+ <menu name="OpenDJ LDAP SDK">
+ <item name="About" href="../opendj-ldap-sdk" />
+ <item name="Examples" href="index.html" />
+ <item name="Toolkit" href="../opendj-ldap-toolkit" />
</menu>
<menu name="Documentation">
- <item name="Developer Guide" href="../docs.html" collapse="true">
+ <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" collapse="true">
<item name="EPUB Format" href="../doc/OpenDJ-Dev-Guide.epub" />
<item name="HTML Format" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" />
<item name="PDF Format" href="../doc/OpenDJ-Dev-Guide.pdf" />
diff --git a/opendj3/opendj-ldap-sdk-examples/src/site/xdoc/index.xml b/opendj3/opendj-ldap-sdk-examples/src/site/xdoc/index.xml
index 952170a..659a357 100644
--- a/opendj3/opendj-ldap-sdk-examples/src/site/xdoc/index.xml
+++ b/opendj3/opendj-ldap-sdk-examples/src/site/xdoc/index.xml
@@ -10,7 +10,7 @@
! Suite 900, Mountain View, California, 94041, USA.
!
! You can also obtain a copy of the license at
- ! src/main/resources/legal-notices/CC-BY-NC-ND.txt.
+ ! trunk/opendj3/legal-notices/CC-BY-NC-ND.txt.
! See the License for the specific language governing permissions
! and limitations under the License.
!
@@ -81,7 +81,7 @@
For the DIY enthusiasts you can build it yourself by checking out the
latest code using
<a href="source-repository.html">Subversion</a>
- and building it with Maven 3
+ and building it with Maven 3.
</p>
</subsection>
</section>
diff --git a/opendj3/opendj-ldap-sdk/src/site/site.xml b/opendj3/opendj-ldap-sdk/src/site/site.xml
index 68a1d78..94206ff 100644
--- a/opendj3/opendj-ldap-sdk/src/site/site.xml
+++ b/opendj3/opendj-ldap-sdk/src/site/site.xml
@@ -10,7 +10,7 @@
! Suite 900, Mountain View, California, 94041, USA.
!
! You can also obtain a copy of the license at
- ! src/main/resources/legal-notices/CC-BY-NC-ND.txt.
+ ! trunk/opendj3/legal-notices/CC-BY-NC-ND.txt.
! See the License for the specific language governing permissions
! and limitations under the License.
!
@@ -40,14 +40,14 @@
<item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
</menu>
- <menu name="Modules">
- <item name="OpenDJ LDAP SDK" href="index.html" />
- <item name="OpenDJ LDAP SDK Examples" href="../opendj-ldap-sdk-examples" />
- <item name="OpenDJ LDAP Toolkit" href="../opendj-ldap-toolkit" />
+ <menu name="OpenDJ LDAP SDK">
+ <item name="About" href="index.html" />
+ <item name="Examples" href="../opendj-ldap-sdk-examples" />
+ <item name="Toolkit" href="../opendj-ldap-toolkit" />
</menu>
<menu name="Documentation">
- <item name="Developer Guide" href="../docs.html" collapse="true">
+ <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" collapse="true">
<item name="EPUB Format" href="../doc/OpenDJ-Dev-Guide.epub" />
<item name="HTML Format" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" />
<item name="PDF Format" href="../doc/OpenDJ-Dev-Guide.pdf" />
diff --git a/opendj3/opendj-ldap-sdk/src/site/xdoc/index.xml b/opendj3/opendj-ldap-sdk/src/site/xdoc/index.xml
index c282e13..8d0611e 100644
--- a/opendj3/opendj-ldap-sdk/src/site/xdoc/index.xml
+++ b/opendj3/opendj-ldap-sdk/src/site/xdoc/index.xml
@@ -10,7 +10,7 @@
! Suite 900, Mountain View, California, 94041, USA.
!
! You can also obtain a copy of the license at
- ! src/main/resources/legal-notices/CC-BY-NC-ND.txt.
+ ! trunk/opendj3/legal-notices/CC-BY-NC-ND.txt.
! See the License for the specific language governing permissions
! and limitations under the License.
!
@@ -113,7 +113,7 @@
For the DIY enthusiasts you can build it yourself by checking out the
latest code using
<a href="source-repository.html">Subversion</a>
- and building it with Maven 3
+ and building it with Maven 3.
</p>
</subsection>
</section>
diff --git a/opendj3/opendj-ldap-toolkit/src/site/site.xml b/opendj3/opendj-ldap-toolkit/src/site/site.xml
index 8ecb94b..bed8278 100644
--- a/opendj3/opendj-ldap-toolkit/src/site/site.xml
+++ b/opendj3/opendj-ldap-toolkit/src/site/site.xml
@@ -10,7 +10,7 @@
! Suite 900, Mountain View, California, 94041, USA.
!
! You can also obtain a copy of the license at
- ! src/main/resources/legal-notices/CC-BY-NC-ND.txt.
+ ! trunk/opendj3/legal-notices/CC-BY-NC-ND.txt.
! See the License for the specific language governing permissions
! and limitations under the License.
!
@@ -40,14 +40,14 @@
<item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
</menu>
- <menu name="Modules">
- <item name="OpenDJ LDAP SDK" href="../opendj-ldap-sdk" />
- <item name="OpenDJ LDAP SDK Examples" href="../opendj-ldap-sdk-examples" />
- <item name="OpenDJ LDAP Toolkit" href="index.html" />
+ <menu name="OpenDJ LDAP SDK">
+ <item name="About" href="../opendj-ldap-sdk" />
+ <item name="Examples" href="../opendj-ldap-sdk-examples" />
+ <item name="Toolkit" href="index.html" />
</menu>
<menu name="Documentation">
- <item name="Developer Guide" href="../docs.html" collapse="true">
+ <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" collapse="true">
<item name="EPUB Format" href="../doc/OpenDJ-Dev-Guide.epub" />
<item name="HTML Format" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" />
<item name="PDF Format" href="../doc/OpenDJ-Dev-Guide.pdf" />
diff --git a/opendj3/opendj-ldap-toolkit/src/site/xdoc/index.xml b/opendj3/opendj-ldap-toolkit/src/site/xdoc/index.xml
index fcabb3c..92652be 100644
--- a/opendj3/opendj-ldap-toolkit/src/site/xdoc/index.xml
+++ b/opendj3/opendj-ldap-toolkit/src/site/xdoc/index.xml
@@ -10,7 +10,7 @@
! Suite 900, Mountain View, California, 94041, USA.
!
! You can also obtain a copy of the license at
- ! src/main/resources/legal-notices/CC-BY-NC-ND.txt.
+ ! trunk/opendj3/legal-notices/CC-BY-NC-ND.txt.
! See the License for the specific language governing permissions
! and limitations under the License.
!
@@ -31,7 +31,16 @@
</properties>
<body>
<section name="About OpenDJ LDAP Toolkit">
- <p>TODO: Description of the various tools</p>
+ <p>The OpenDJ LDAP Toolkit includes the following command-line tools.ß</p>
+ <dl>
+ <dt>authrate</dt><dd>measure bind throughput and response time</dd>
+ <dt>ldapcompare</dt><dd>perform LDAP compare operations</dd>
+ <dt>ldapmodify</dt><dd>perform LDAP modify, add, delete, mod DN operations</dd>
+ <dt>ldappasswordmodify</dt><dd>perform LDAP password modifications</dd>
+ <dt>ldapsearch</dt><dd>perform LDAP search operations</dd>
+ <dt>modrate</dt><dd>measure modification throughput and response time</dd>
+ <dt>searchrate</dt><dd>measure search throughput and response time</dd>
+ </dl>
</section>
<section name="Get the OpenDJ LDAP Toolkit">
<p>
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 7b104ff..93a9f11 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -434,4 +434,18 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <licenses>
+ <license>
+ <name>CC BY-NC-ND 3.0</name>
+ <url>http://creativecommons.org/licenses/by-nc-nd/3.0/</url>
+ <comments>Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</comments>
+ <distribution>repo</distribution>
+ </license>
+ <license>
+ <name>CDDL-1.0</name>
+ <url>http://www.opensource.org/licenses/cddl1.php</url>
+ <comments>Common Development and Distribution License (CDDL) 1.0</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
</project>
diff --git a/opendj3/src/site/site.xml b/opendj3/src/site/site.xml
index 51b7de7..2c31e80 100644
--- a/opendj3/src/site/site.xml
+++ b/opendj3/src/site/site.xml
@@ -55,39 +55,40 @@
<item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
</menu>
- <menu name="Modules">
- <item name="OpenDJ LDAP SDK" href="opendj-ldap-sdk" />
- <item name="OpenDJ LDAP SDK Examples" href="opendj-ldap-sdk-examples" />
- <item name="OpenDJ LDAP Toolkit" href="opendj-ldap-toolkit" />
+ <menu name="OpenDJ LDAP SDK">
+ <item name="About" href="opendj-ldap-sdk" />
+ <item name="Examples" href="opendj-ldap-sdk-examples" />
+ <item name="Toolkit" href="opendj-ldap-toolkit" />
</menu>
<menu name="Core Documentation">
- <item name="Release Notes" href="docs.html" collapse="true">
+ <item name="Overview" href="docs.html" />
+ <item name="Release Notes" href="./doc/release-notes/OpenDJ-Release-Notes.html" collapse="true">
<item name="EPUB Format" href="./doc/OpenDJ-Release-Notes.epub"/>
<item name="HTML Format" href="./doc/release-notes/OpenDJ-Release-Notes.html"/>
<item name="PDF Format" href="./doc/OpenDJ-Release-Notes.pdf" />
<item name="RTF Format" href="./doc/OpenDJ-Release-Notes.rtf" />
</item>
- <item name="Installation Guide" href="docs.html" collapse="true">
+ <item name="Installation Guide" href="./doc/install-guide/OpenDJ-Install-Guide.html" collapse="true">
<item name="EPUB Format" href="./doc/OpenDJ-Install-Guide.epub"/>
<item name="HTML Format" href="./doc/install-guide/OpenDJ-Install-Guide.html" />
<item name="PDF Format" href="./doc/OpenDJ-Install-Guide.pdf" />
<item name="RTF Format" href="./doc/OpenDJ-Install-Guide.rtf" />
</item>
- <item name="Administration Guide" href="docs.html" collapse="true">
+ <item name="Administration Guide" href="./doc/admin-guide/OpenDJ-Admin-Guide.html" collapse="true">
<item name="EPUB Format" href="./doc/OpenDJ-Admin-Guide.epub" />
<item name="HTML Format" href="./doc/admin-guide/OpenDJ-Admin-Guide.html" />
<item name="PDF Format" href="./doc/OpenDJ-Admin-Guide.pdf" />
<item name="RTF Format" href="./doc/OpenDJ-Admin-Guide.rtf" />
</item>
- <item name="Developer Guide" href="docs.html" collapse="true">
+ <item name="Developer Guide" href="./doc/dev-guide/OpenDJ-Dev-Guide.html" collapse="true">
<item name="EPUB Format" href="./doc/OpenDJ-Dev-Guide.epub" />
<item name="HTML Format" href="./doc/dev-guide/OpenDJ-Dev-Guide.html" />
<item name="PDF Format" href="./doc/OpenDJ-Dev-Guide.pdf" />
<item name="RTF Format" href="./doc/OpenDJ-Dev-Guide.rtf" />
</item>
- <item name="Config Reference" href="index.html" alt="TODO" />
- <item name="Plugin Javadoc" href="index.html" alt="TODO" />
+ <item name="Config Reference" href="404.html" alt="TODO" />
+ <item name="Plugin Javadoc" href="404.html" alt="TODO" />
<item name="SDK Javadoc" href="./opendj-ldap-sdk/apidocs/index.html" />
</menu>
diff --git a/opendj3/src/site/xdoc/404.xml b/opendj3/src/site/xdoc/404.xml
new file mode 100644
index 0000000..5f66f7a
--- /dev/null
+++ b/opendj3/src/site/xdoc/404.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ! CCPL HEADER START
+ !
+ ! This work is licensed under the Creative Commons
+ ! Attribution-NonCommercial-NoDerivs 3.0 Unported License.
+ ! To view a copy of this license, visit
+ ! http://creativecommons.org/licenses/by-nc-nd/3.0/
+ ! or send a letter to Creative Commons, 444 Castro Street,
+ ! Suite 900, Mountain View, California, 94041, USA.
+ !
+ ! You can also obtain a copy of the license at
+ ! trunk/opendj3/legal-notices/CC-BY-NC-ND.txt.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! If applicable, add the following below this CCPL HEADER, with the fields
+ ! enclosed by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CCPL HEADER END
+ !
+ ! Copyright 2011 ForgeRock AS
+ !
+-->
+<document
+ xmlns="http://maven.apache.org/XDOC/2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ <properties>
+ <title>OpenDJ Community Site - Page Not Found</title>
+ <author email="opendj-dev@forgerock.org">ForgeRock AS</author>
+ </properties>
+ <body>
+ <section name="Page Not Found">
+ <p>The page you are looking for is not yet part of this site.</p>
+ </section>
+ </body>
+</document>
+
diff --git a/opendj3/src/site/xdoc/docs.xml b/opendj3/src/site/xdoc/docs.xml
index a6cb63c..fc12db7 100644
--- a/opendj3/src/site/xdoc/docs.xml
+++ b/opendj3/src/site/xdoc/docs.xml
@@ -60,10 +60,10 @@
<a href="./doc/OpenDJ-Dev-Guide.rtf">RTF</a></dd>
<dt>Configuration Reference</dt>
- <dd><a href="TODO">HTML</a></dd>
+ <dd><a href="404.html">HTML</a></dd>
<dt>Server Plugin API Specification</dt>
- <dd><a href="TODO">HTML</a></dd>
+ <dd><a href="404.html">HTML</a></dd>
<dt>LDAP Client API Specification</dt>
<dd><a href="./opendj-ldap-sdk/apidocs/index.html">HTML</a></dd>
--
Gitblit v1.10.0