svn commit: r419853 - in /db/derby/docs/trunk/src: devguide/cdevcsecure863446.dita devguide/rdevcsecure557.dita tuning/rtunproper25581.dita

[ka...@apache.org]

Author: kahatlen
Date: Fri Jul  7 02:58:25 2006
New Revision: 419853

URL: http://svn.apache.org/viewvc?rev=419853&view=rev
Log:
DERBY-1000: For LDAP authentication: derby.authentication.server
should support ldaps:// as part of the server url.

Update the documentation to reflect the code changes. Patch
contributed by Anders Morken.

Modified:
    db/derby/docs/trunk/src/devguide/cdevcsecure863446.dita
    db/derby/docs/trunk/src/devguide/rdevcsecure557.dita
    db/derby/docs/trunk/src/tuning/rtunproper25581.dita

Modified: db/derby/docs/trunk/src/devguide/cdevcsecure863446.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcsecure863446.dita?rev=419853&r1=419852&r2=419853&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecure863446.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecure863446.dita Fri Jul  7 02:58:25 2006
@@ -20,12 +20,17 @@
 <concept id="cdevcsecure863446" xml:lang="en-us">
 <title>Setting up Derby to use your LDAP directory service</title>
 <shortdesc>When specifying LDAP as your authentication service, you must specify
-the location of the server and its port number.</shortdesc>
+what LDAP server to use.</shortdesc>
 <prolog></prolog>
 <conbody>
 <ul>
 <li><i>derby.authentication.server</i>   <p>Set the property <i>derby.authentication.server</i> to
-the location and port number of the LDAP server. For example:</p>  <codeblock>derby.authentication.server=godfrey:389</codeblock></li>
-</ul>
-</conbody>
+the URL to the LDAP server. For example:</p> 
+<codeblock>derby.authentication.server=ldap://godfrey:389/</codeblock>
+<p>The LDAP server may be specified using just the server name, the server name
+and its port number separated by a colon, or a ldap URL. If a full URL is not provided, 
+Derby will by default use unencrypted LDAP - to use SSL encrypted LDAP an URL
+starting with "ldaps://" must be provided.</p>
+<p>Also note that support for ldaps:// URLs requires that Derby runs on Java 1.4.2 or higher.</p>
+</li> </ul> </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/rdevcsecure557.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevcsecure557.dita?rev=419853&r1=419852&r2=419853&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevcsecure557.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevcsecure557.dita Fri Jul  7 02:58:25 2006
@@ -56,8 +56,8 @@
 built-in user repository.</entry>
 </row>
 <row>
-<entry colname="1"><i>javax.naming.*</i></entry>
-<entry colname="2">JNDI properties</entry>
+<entry colname="1"><i>java.naming.*</i></entry>
+<entry colname="2">JNDI properties. See Appendix A in the JNDI API reference for more information about these.</entry>
 </row>
 </tbody>
 </tgroup>

Modified: db/derby/docs/trunk/src/tuning/rtunproper25581.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/rtunproper25581.dita?rev=419853&r1=419852&r2=419853&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/rtunproper25581.dita (original)
+++ db/derby/docs/trunk/src/tuning/rtunproper25581.dita Fri Jul  7 02:58:25 2006
@@ -30,14 +30,15 @@
 LDAP, specify the host name and port number.</p> <p>The server must be known
 on the network.</p> <p>For more information about external user authentication,
 see "External Directory Service" in the <cite><ph conref="tunconrefs.dita#pub/citdevelop"></ph>.</cite></p> </section>
-<section><title>Default</title> <p>Not applicable.</p> </section>
+<section><title>Default</title> <p>Not applicable. Note that if the protocol type
+is unspecified, it defaults to LDAP.</p> </section>
 <refsyn><title>Syntax</title> <codeblock><b>derby.authentication.server=
-[{ ldap: | nisplus: }]
+[{ ldap: | ldaps: | nisplus: }]
 [//]
 
 {
-<b><i>    hostname</i></b>:<b><i>portnumber |
-    nisServerName</i></b>/<b><i>nisDomain</i></b>
+<b><i>    hostname</i></b> [ :<b><i>portnumber </i></b>] |
+<b><i>    nisServerName</i></b>/<b><i>nisDomain</i></b>
 }</b></codeblock> </refsyn>
 <example><title>Example</title> <codeblock><b><ph>-- system-wide property
 ##LDAP example</ph>
@@ -46,6 +47,8 @@
 derby.authentication.server=ldap://godfrey:9090
 <ph>##LDAP example</ph>
 derby.authentication.server=//godfrey:9090
+<ph>##LDAP over SSL example</ph>
+derby.authentication.server=ldaps://godfrey:636/
 <ph>-- database-wide property</ph>
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.authentication.server',