From f1e22bcef58ba7a590a5b19e3a7f93d8dae4716d Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 07 Jun 2013 14:14:31 +0000
Subject: [PATCH] Review comments thanks to Jean-Noel, code review by IM
---
opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml b/opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml
index 0206eb2..8ecf7c6 100644
--- a/opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml
+++ b/opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml
@@ -28,7 +28,7 @@
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
xmlns:xlink='http://www.w3.org/1999/xlink'
- xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ >
<title>REST LDAP Configuration</title>
<indexterm><primary>REST</primary></indexterm>
<indexterm><primary>HTTP</primary></indexterm>
@@ -681,7 +681,7 @@
</listitem>
<listitem>
- <para>(Optional) "defaultValue": the JSON value if no LDAP
+ <para>(Optional) "defaultJSONValue": the JSON value if no LDAP
attribute is available on the entry.</para>
<para>No default is set if this is omitted.</para>
@@ -841,12 +841,6 @@
</listitem>
<listitem>
- <para>(Optional) "filter": specifies the LDAP filter to use to
- search for the referenced entry. The default is
- <literal>"(objectClass=*)"</literal>.</para>
- </listitem>
-
- <listitem>
<para>(Optional) "isRequired": true means the LDAP attribute is
mandatory and must be provided to create the resource; false
means it is optional.</para>
@@ -862,11 +856,19 @@
<para>Default: <literal>false</literal></para>
</listitem>
+ <!-- Not used.
<listitem>
<para>(Optional) "scope": indicates the scope of the LDAP search
to find the referenced entry. The default is
<literal>"SearchScope.WHOLE_SUBTREE"</literal>.</para>
</listitem>
+ -->
+
+ <listitem>
+ <para>(Optional) "searchFilter": specifies the LDAP filter to
+ use to search for the referenced entry. The default is
+ <literal>"(objectClass=*)"</literal>.</para>
+ </listitem>
<listitem>
<para>(Optional) "writability": indicates whether the mapping
--
Gitblit v1.10.0