From a8904ae7dedca654b3d04166f41ecbe1754681a3 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 26 Mar 2013 17:42:11 +0000
Subject: [PATCH] CR-1475 Fix for OPENDJ-829: Document how to configure the commons REST based HTTP connection handler

---
 opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml b/opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml
index 01d46b5..70fa564 100644
--- a/opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml
+++ b/opendj3/src/main/docbkx/admin-guide/appendix-rest2ldap.xml
@@ -29,16 +29,33 @@
           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 Gateway Configuration</title>
- <indexterm><primary>REST LDAP gateway</primary></indexterm>
+ <title>REST LDAP Configuration</title>
+ <indexterm><primary>REST</primary></indexterm>
+ <indexterm><primary>HTTP</primary></indexterm>
  <!-- This belongs in an OpenDJ reference. Ultimately this doc should
       be generated, too, rather than written by hand. CREST-71? -->
 
- <para>The OpenDJ REST LDAP gateway runs as a Servlet independent from your
- directory service. You configure the gateway to access your directory service
- by editing <filename>opendj-rest2ldap-servlet.json</filename> where you deploy
- the gateway web application.</para>
+ <itemizedlist>
+  <para>OpenDJ offers two alternatives for RESTful access to directory
+  data.</para>
 
+  <listitem>
+   <para>OpenDJ directory server has an HTTP connection handler that exposes
+   the RESTful API over HTTP (or HTTPS). You configure the mapping between
+   JSON resources and LDAP entries by editing the configuration file for the
+   HTTP connection handler, by default
+   <filename>/path/to/OpenDJ/config/http-config.json</filename>.</para>
+  </listitem>
+
+  <listitem>
+   <para>The OpenDJ REST LDAP gateway runs as a Servlet independent from your
+   directory service. You configure the gateway to access your directory service
+   by editing <filename>opendj-rest2ldap-servlet.json</filename> where you
+   deploy the gateway web application.</para>
+  </listitem>
+ </itemizedlist>
+
+ <!-- To be updated, pending OPENDJ-828 -->
  <variablelist>
   <para>The JSON format configuration can hold the following configuration
   objects.</para>

--
Gitblit v1.10.0