directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r866770 [7/9] - in /websites/staging/directory/trunk/content: ./ apacheds/ apacheds/advanced-ug/ apacheds/basic-ug/ apacheds/configuration/ apacheds/kerberos-ug/ api/ api/gen-docs/ api/gen-docs/latest/ api/groovy-api/ api/user-guide/ studio/
Date Fri, 21 Jun 2013 10:04:40 GMT
Modified: websites/staging/directory/trunk/content/apacheds/kerberos-ug/4.2-authenticate-studio.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/kerberos-ug/4.2-authenticate-studio.html (original)
+++ websites/staging/directory/trunk/content/apacheds/kerberos-ug/4.2-authenticate-studio.html Fri Jun 21 10:04:38 2013
@@ -139,66 +139,75 @@
 
 <h1 id="41-authenticate-with-studio">4.1 - Authenticate with Studio</h1>
 <p>We will explain how to use the kerberos server to authentify users on a LDAP server. Let's first define the way we will store data in the LDAP server</p>
-<p><DIV class="info" markdown="1">
-We will suppose that the <strong>Kerberos</strong> server is installed on a server which <em>hostName</em> is <strong>example.net</strong> and the <em>realm</em> is <strong>EXAMPLE.COM</strong> in the following paragraphes.
-</DIV></p>
+<DIV class="info" markdown="1">
+We will suppose that the **Kerberos** server is installed on a server which _hostName_ is **example.net** and the _realm_ is **EXAMPLE.COM** in the following paragraphes.
+</DIV>
+
 <h2 id="servers-configuration">Servers configuration</h2>
 <p>We first have to configure the <strong>LDAP</strong> and <strong>Kerberos</strong> server, in order to be able to use the kerberos server to authenticate on the ldap server.</p>
 <p>If you have installed the <strong>ApacheDS</strong> package, the simplest way is to start the server, and to connect on it using Studio, using the <em>uid=admin,ou=system</em> user with <em>secret</em> as a password (this password will have to be changed later !).</p>
-<p><DIV align="center">
-<img alt="Admin Connection" src="images/admin-connection.png" />
-</DIV></p>
+<DIV align="center">
+![Admin Connection](images/admin-connection.png)
+</DIV>
+
 <p>and :</p>
-<p><DIV align="center">
-<img alt="Admin Authentication" src="images/admin-authentication.png" />
-</DIV></p>
+<DIV align="center">
+![Admin Authentication](images/admin-authentication.png)
+</DIV>
+
 <p>Once connected, right click on the connection :</p>
-<p><DIV align="center">
-<img alt="Open Configuration" src="images/open-config.png" />
-</DIV></p>
+<DIV align="center">
+![Open Configuration](images/open-config.png)
+</DIV>
+
 <p>On the <strong>Overview</strong> tab, check the <strong>Enable Kerberos Server</strong> box :</p>
-<p><DIV align="center">
-<img alt="Enable Kerberos Server" src="images/enable-kerberos.png" />
-</DIV></p>
+<DIV align="center">
+![Enable Kerberos Server](images/enable-kerberos.png)
+</DIV>
+
 <h3 id="ldap-server-configuration">LDAP Server configuration</h3>
 <p>There are a few parameters that are to be set in the <strong>LDAP</strong> configuration :</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="n">The</span> <span class="n">_SASL</span> <span class="n">host_</span> <span class="n">must</span> <span class="n">be</span> <span class="n">the</span> <span class="nb">local</span> <span class="n">server</span> <span class="n">name</span> <span class="p">(</span><span class="n">here</span><span class="p">,</span> <span class="n">example</span><span class="o">.</span><span class="n">net</span><span class="p">)</span>
-<span class="o">*</span> <span class="n">The</span> <span class="n">_SASL</span> <span class="n">principal_</span> <span class="n">is</span> <span class="o">**</span><span class="n">ldap</span><span class="o">/</span><span class="n">example</span><span class="o">.</span><span class="n">net</span><span class="nv">@EXAMPLE</span><span class="o">.</span><span class="n">COM</span><span class="o">**</span>
-<span class="o">*</span> <span class="n">The</span> <span class="n">_Search</span> <span class="n">Base</span> <span class="n">DN_</span> <span class="n">should</span> <span class="n">point</span> <span class="n">to</span> <span class="n">the</span> <span class="n">place</span> <span class="n">under</span> <span class="n">which</span> <span class="n">we</span> <span class="n">store</span> <span class="n">users</span> <span class="ow">and</span> <span class="n">services</span> <span class="p">(</span><span class="n">_dc</span><span class="o">=</span><span class="n">security</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com_</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="o">*</span> <span class="n">The</span> <span class="n">_SASL</span> <span class="n">host_</span> <span class="n">must</span> <span class="n">be</span> <span class="n">the</span> <span class="n">local</span> <span class="n">server</span> <span class="n">name</span> <span class="p">(</span><span class="n">here</span><span class="p">,</span> <span class="n">example</span><span class="p">.</span><span class="n">net</span><span class="p">)</span>
+<span class="o">*</span> <span class="n">The</span> <span class="n">_SASL</span> <span class="n">principal_</span> <span class="n">is</span> <span class="o">**</span><span class="n">ldap</span><span class="o">/</span><span class="n">example</span><span class="p">.</span><span class="n">net</span><span class="p">@</span><span class="n">EXAMPLE</span><span class="p">.</span><span class="n">COM</span><span class="o">**</span>
+<span class="o">*</span> <span class="n">The</span> <span class="n">_Search</span> <span class="n">Base</span> <span class="n">DN_</span> <span class="n">should</span> <span class="n">point</span> <span class="n">to</span> <span class="n">the</span> <span class="n">place</span> <span class="n">under</span> <span class="n">which</span> <span class="n">we</span> <span class="n">store</span> <span class="n">users</span> <span class="n">and</span> <span class="n">services</span> <span class="p">(</span><span class="n">_dc</span><span class="p">=</span><span class="n">security</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">com_</span><span class="p">)</span>
 </pre></div>
 
 
-<p><DIV class="warning" markdown="1">
-The <em>SASL principal</em> instance part (ie, <strong>example.net</strong>) is in lower case, as the hostname is not case sensitive. Sadly, the <em>KrbPrincipalName</em> attributeType is case sensitive, so if the left part is not lowercased, the server won't be able to retrieve the information from the LDAP server.
-</DIV></p>
+<DIV class="warning" markdown="1">
+The _SASL principal_ instance part (ie, **example.net**) is in lower case, as the hostname is not case sensitive. Sadly, the _KrbPrincipalName_ attributeType is case sensitive, so if the left part is not lowercased, the server won't be able to retrieve the information from the LDAP server.
+</DIV>
+
 <p>Here is a snapshot of this configuration :</p>
-<p><DIV align="center">
-<img alt="LDAP configuration" src="images/ldap-config.png" />
-</DIV></p>
+<DIV align="center">
+![LDAP configuration](images/ldap-config.png)
+</DIV>
+
 <h3 id="kerberos-server-configuration">Kerberos Server configuration</h3>
 <p>Now, you can switch to the Kerberos tab, where some more configuration must be set :</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="n">The</span> <span class="n">_Primary</span> <span class="n">KDC</span> <span class="n">Realm_</span> <span class="n">is</span> <span class="n">EXAMPLE</span><span class="o">.</span><span class="n">COM</span>
-<span class="o">*</span> <span class="n">The</span> <span class="n">_Search</span> <span class="n">Base</span> <span class="n">DN_</span> <span class="n">is</span> <span class="n">the</span> <span class="n">same</span> <span class="n">as</span> <span class="k">for</span> <span class="n">the</span> <span class="n">LDAP</span> <span class="n">server</span> <span class="p">:</span> <span class="n">_dc</span><span class="o">=</span><span class="n">security</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com_</span>
+<div class="codehilite"><pre><span class="o">*</span> <span class="n">The</span> <span class="n">_Primary</span> <span class="n">KDC</span> <span class="n">Realm_</span> <span class="n">is</span> <span class="n">EXAMPLE</span><span class="p">.</span><span class="n">COM</span>
+<span class="o">*</span> <span class="n">The</span> <span class="n">_Search</span> <span class="n">Base</span> <span class="n">DN_</span> <span class="n">is</span> <span class="n">the</span> <span class="n">same</span> <span class="n">as</span> <span class="k">for</span> <span class="n">the</span> <span class="n">LDAP</span> <span class="n">server</span> <span class="p">:</span> <span class="n">_dc</span><span class="p">=</span><span class="n">security</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">com_</span>
 </pre></div>
 
 
 <p>Here is a Ssnapshot of this configuration :</p>
-<p><DIV align="center">
-<img alt="Kerberos configuration" src="images/kerberos-config.png" />
-</DIV></p>
+<DIV align="center">
+![Kerberos configuration](images/kerberos-config.png)
+</DIV>
+
 <p>Once those modifications have been done, you must restart the server.</p>
 <h3 id="other-configuration">Other configuration</h3>
 <p>There is one more thing that you need to configure : your domain name (here, example.net_) has to be reachable on your machine. Either you define in on a <strong>DNS</strong> server, or you can also add it in your <em>/etc/hosts</em> file.</p>
 <p>Here is a way to add it on a local host :</p>
-<div class="codehilite"><pre><span class="o">...</span>
-<span class="mf">127.0.0.1</span> <span class="n">localhost</span> <span class="n">example</span><span class="o">.</span><span class="n">net</span>
-<span class="o">...</span>
+<div class="codehilite"><pre><span class="p">...</span>
+127<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span>1 <span class="n">localhost</span> <span class="n">example</span><span class="p">.</span><span class="n">net</span>
+<span class="p">...</span>
 </pre></div>
 
 
-<p><DIV class="warning" markdown="1">
+<DIV class="warning" markdown="1">
 It's largely preferable to declare the server in a DNS.
-</DIV></p>
+</DIV>
+
 <h2 id="ldap-hierarchy">LDAP Hierarchy</h2>
 <p>We will distinguish between <strong>users</strong> and <strong>services</strong> :
 <em> Users are human beings, or applications that can log on a service
@@ -206,9 +215,10 @@ It's largely preferable to declare the s
 <p>In our case, the ldap server and the <strong>TGS</strong> are services.</p>
 <p>Each user and each service will be declared using an <em>entry</em> in the ldap server.</p>
 <p>We will store those entries in a part of the <strong>DIT</strong> where the kerberos server and the ldap server will be able to find them. Assuming we have created our own partition named <strong>dc=example,dc=com</strong>, we will define this hierarchy starting from there :</p>
-<p><DIV align="center">
-<img alt="Authentification hierarchy" src="images/authent-hierarchy.png" />
-</DIV></p>
+<DIV align="center">
+![Authentification hierarchy](images/authent-hierarchy.png)
+</DIV>
+
 <p>This can be injected in the LDAP server using this LDIF :</p>
 <div class="codehilite"><pre>dn: dc=security,dc=example,dc=com
 objectClass: top
@@ -250,9 +260,10 @@ userPassword: secret
 
 
 <p>This user does not have a password yet.</p>
-<p><DIV class="info" markdown="1">
-The import thing is the <em>krb5PrincipalName</em>, which is the one that will be used to bind the user. It has a user login (<strong>hnelson</strong>) and a realm (<strong>EXAMPLE.COM</strong>).
-</DIV></p>
+<DIV class="info" markdown="1">
+The import thing is the _krb5PrincipalName_, which is the one that will be used to bind the user. It has a user login (**hnelson**) and a realm (**EXAMPLE.COM**).
+</DIV>
+
 <p>Once the user has been injected, we can see that the server has created some krb5Key attributes :</p>
 <div class="codehilite"><pre>dn: uid=hnelson,ou=users,dc=security,dc=example,dc=com
 objectClass: top
@@ -309,36 +320,38 @@ ou: LDAP
 </pre></div>
 
 
-<p><DIV class="info" markdown="1">
-Three important things :</p>
-<ul>
-<li>the userPassword is 'randomkey'. The key will not be generated based on a know password, they will use a random key.</li>
-<li>the <em>krb5PrincipalName</em> has one more information, after the / character : <em>EXAMPLE.COM</em> for 
-    the <strong>krbtgt</strong> service, and <em>example.net</em> for the <strong>ldap</strong> service. For the <strong>krbtgt</strong> principal, the instance is always the realm name. For the <strong>ldap</strong> principal, the instance is the hostname, in lowercase.</li>
-<li>the krb5KeyVersionNumber is 0
-</DIV></li>
-</ul>
+<DIV class="info" markdown="1">
+Three important things :
+
+- the userPassword is 'randomkey'. The key will not be generated based on a know password, they will use a random key.
+- the _krb5PrincipalName_ has one more information, after the / character : _EXAMPLE.COM_ for 
+    the **krbtgt** service, and _example.net_ for the **ldap** service. For the **krbtgt** principal, the instance is always the realm name. For the **ldap** principal, the instance is the hostname, in lowercase.
+- the krb5KeyVersionNumber is 0
+</DIV>
+
 <p>Again, once those entries have been injected in the LDAP server, the <em>krb5Key</em> attributeTypes will be created</p>
 <h2 id="login-using-studio">Login using Studio</h2>
 <p>Now that the server is set, and the services and users are stored into it, we can create a new connection using the Kerberos authentication for the created users.</p>
 <h3 id="create-a-new-connection">Create a new connection</h3>
 <p>On the "Connections" tab, right click and select 'New Connection...'</p>
-<p><DIV align="center">
-<img alt="New Connection" src="images/new-connection.png" />
-</DIV></p>
+<DIV align="center">
+![New Connection](images/new-connection.png)
+</DIV>
+
 <p>You will now have to set the network parameters, as in the following popup. Typically, set :</p>
 <div class="codehilite"><pre><span class="o">*</span> <span class="n">The</span> <span class="n">connection</span> <span class="n">name</span> <span class="p">(</span><span class="n">here</span><span class="p">,</span> <span class="o">**</span><span class="n">Kerberos</span> <span class="n">User</span><span class="o">**</span><span class="p">)</span>
-<span class="o">*</span> <span class="n">The</span> <span class="n">LDAP</span> <span class="n">server</span> <span class="n">host</span> <span class="p">(</span><span class="o">**</span><span class="n">example</span><span class="o">.</span><span class="n">net</span><span class="o">**</span><span class="p">)</span>
-<span class="o">*</span> <span class="n">The</span> <span class="n">LDAP</span> <span class="n">server</span> <span class="n">port</span> <span class="p">(</span><span class="o">**</span><span class="mi">10389</span><span class="o">**</span><span class="p">)</span>
+<span class="o">*</span> <span class="n">The</span> <span class="n">LDAP</span> <span class="n">server</span> <span class="n">host</span> <span class="p">(</span><span class="o">**</span><span class="n">example</span><span class="p">.</span><span class="n">net</span><span class="o">**</span><span class="p">)</span>
+<span class="o">*</span> <span class="n">The</span> <span class="n">LDAP</span> <span class="n">server</span> <span class="n">port</span> <span class="p">(</span><span class="o">**</span>10389<span class="o">**</span><span class="p">)</span>
 <span class="o">*</span> <span class="n">The</span> <span class="n">Provider</span> <span class="p">(</span><span class="n">pick</span> <span class="o">**</span><span class="n">Apache</span> <span class="n">Directory</span> <span class="n">LDAP</span> <span class="n">Client</span> <span class="n">API</span><span class="o">**</span><span class="p">)</span>
 </pre></div>
 
 
 <p>You can check the connection on cliking the 'check network connection' button, you should get back a popup stating that the connection was established successfully.</p>
 <p>Here is the screenshot :</p>
-<p><DIV align="center">
-<img alt="Network Parameters" src="images/network-parameters.png" />
-</DIV></p>
+<DIV align="center">
+![Network Parameters](images/network-parameters.png)
+</DIV>
+
 <p>Then click on Next to setup the authentication part.
 Select the following parameters and values :</p>
 <div class="codehilite"><pre>* Authentication method : <span class="nt">&lt;b&gt;</span>GSSAPI<span class="nt">&lt;/b&gt;</span>
@@ -355,9 +368,10 @@ Select the following parameters and valu
 
 
 <p>Here is the resulting screen :</p>
-<p><DIV align="center">
-<img alt="Kerberos authentification" src="images/kerberos-authent.png" />
-</DIV></p>
+<DIV align="center">
+![Kerberos authentification](images/kerberos-authent.png)
+</DIV>
+
 <p>Clinking in the 'Check Authentication' buton should be succesfull.</p>
 
 

Modified: websites/staging/directory/trunk/content/apacheds/news.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/news.html (original)
+++ websites/staging/directory/trunk/content/apacheds/news.html Fri Jun 21 10:04:38 2013
@@ -133,8 +133,7 @@
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1826">DIRSERVER-1826</a> - The ads-pwdFailureCountInterval is not taken into account</li>
 <li><a href="https://issues.apache.org/jira/browse/DIRSERVER-1834">DIRSERVER-1834</a> - Broken backend when using AT with no EQUALITY MR</li>
 </ul>
-<p>This is a critical version, and anyone using 2.0.0-M11 should replace it with this version.<br />
-</p>
+<p>This is a critical version, and anyone using 2.0.0-M11 should replace it with this version.  </p>
 <p>Downloads are available <a href="downloads.html">here</a></p>
 <h2 id="apacheds-200-m11-released-posted-on-march-3rd-2013">ApacheDS 2.0.0-M11 released <em>posted on March 3rd, 2013</em></h2>
 <p>The Apache Directory team is pleased to announce the release of ApacheDS 2.0.0-M11, the eleventh milestone towards a 2.0 version.</p>

Modified: websites/staging/directory/trunk/content/api/download-old-versions.html
==============================================================================
--- websites/staging/directory/trunk/content/api/download-old-versions.html (original)
+++ websites/staging/directory/trunk/content/api/download-old-versions.html Fri Jun 21 10:04:38 2013
@@ -120,133 +120,59 @@
 
 <h1 id="download-old-versions">Download Old Versions</h1>
 <h2 id="ldap-api-10">LDAP API 1.0</h2>
-<p><DIV markdown="1">
-<center></p>
-<table>
-<thead>
-<tr>
-<th align="center">Version</th>
-<th align="center">Download Link</th>
-<th align="center">Date</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M15 binaries</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/dist/1.0.0-M15">Download</a></td>
-<td align="center">28/Jan/2013</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M15 sources</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M15">Download</a></td>
-<td align="center">28/Jan/2013</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M14</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M14">Download</a></td>
-<td align="center">07/Jan/2013</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M13</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M13">Download</a></td>
-<td align="center">12/Oct/2012</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M12</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M12">Download</a></td>
-<td align="center">09/May/2012</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M11</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M11">Download</a></td>
-<td align="center">28/feb/2012</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M10</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M10">Download</a></td>
-<td align="center">03/Feb/2012</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M9</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M9">Download</a></td>
-<td align="center">17/Jan/2012</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M8</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M8">Download</a></td>
-<td align="center">05/Sep/2011</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M7</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M7">Download</a></td>
-<td align="center">15/Aug/2011</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M6</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M6">Download</a></td>
-<td align="center">04/Aug/2011</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M5</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M5">Download</a></td>
-<td align="center">25/Jun/2011</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M4</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M4">Download</a></td>
-<td align="center">30/May/2011</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M3</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M3">Download</a></td>
-<td align="center">22/Apr/2011</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M2</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M2">Download</a></td>
-<td align="center">15/Mar/2011</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 1.0.0-M1</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/1.0.0-M1">Download</a></td>
-<td align="center">18/Feb/2011</td>
-</tr>
-<tr>
-<td align="center">Apache LDAP API 0.1</td>
-<td align="center"><a href="http://archive.apache.org/dist/directory/api/unstable/0.1/">Download</a></td>
-<td align="center">24/Mar/2010</td>
-</tr>
-</tbody>
-</table>
-<p></center>
-</DIV></p>
-<p><DIV class="note" markdown="1">
-We encourage you to verify the integrity of the downloaded file using:</p>
-<ul>
-<li>the ASC file (OpenPGP compatible signature) with the <a href="http://www.apache.org/dist/directory/KEYS">KEYS</a> file (code signing keys used to sign the product)</li>
-<li>the MD5 file (checksum).
-</DIV></li>
-</ul>
+<DIV markdown="1">
+<center>
+
+| Version| Download Link | Date |
+|:-:|:-:|:-:|
+| Apache LDAP API 1.0.0-M15 binaries | [Download](http://archive.apache.org/dist/directory/api/dist/1.0.0-M15) | 28/Jan/2013 |
+| Apache LDAP API 1.0.0-M15 sources | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M15) | 28/Jan/2013 |
+| Apache LDAP API 1.0.0-M14 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M14) | 07/Jan/2013 |
+| Apache LDAP API 1.0.0-M13 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M13) | 12/Oct/2012 |
+| Apache LDAP API 1.0.0-M12 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M12) | 09/May/2012 |
+| Apache LDAP API 1.0.0-M11 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M11) | 28/feb/2012 |
+| Apache LDAP API 1.0.0-M10 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M10) | 03/Feb/2012 |
+| Apache LDAP API 1.0.0-M9 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M9) | 17/Jan/2012 |
+| Apache LDAP API 1.0.0-M8 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M8) | 05/Sep/2011 |
+| Apache LDAP API 1.0.0-M7 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M7) | 15/Aug/2011 |
+| Apache LDAP API 1.0.0-M6 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M6) | 04/Aug/2011 |
+| Apache LDAP API 1.0.0-M5 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M5) | 25/Jun/2011 |
+| Apache LDAP API 1.0.0-M4 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M4) | 30/May/2011 |
+| Apache LDAP API 1.0.0-M3 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M3) | 22/Apr/2011 |
+| Apache LDAP API 1.0.0-M2 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M2) | 15/Mar/2011 |
+| Apache LDAP API 1.0.0-M1 | [Download](http://archive.apache.org/dist/directory/api/1.0.0-M1) | 18/Feb/2011 |
+| Apache LDAP API 0.1 | [Download](http://archive.apache.org/dist/directory/api/unstable/0.1/) | 24/Mar/2010 |
+
+</center>
+</DIV>
+
+<DIV class="note" markdown="1">
+We encourage you to verify the integrity of the downloaded file using:
+
+* the ASC file (OpenPGP compatible signature) with the [KEYS](http://www.apache.org/dist/directory/KEYS) file (code signing keys used to sign the product)
+* the MD5 file (checksum).
+</DIV>
+
 <h2 id="verify-the-integrity-of-the-file">Verify the integrity of the file</h2>
 <p>The PGP signatures can be verified using PGP or GPG. First download the <a href="http://www.apache.org/dist/directory/KEYS">keys</a> file as well as the asc signature file for the relevant distribution. Then verify the signatures using:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgpv</span> <span class="n">apache_1</span><span class="mf">.3.24</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
+$ <span class="n">pgpv</span> <span class="n">apache_1</span><span class="p">.</span>3<span class="p">.</span>24<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
 </pre></div>
 
 
 <p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgp</span> <span class="n">apache_1</span><span class="mf">.3.24</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
+$ <span class="n">pgp</span> <span class="n">apache_1</span><span class="p">.</span>3<span class="p">.</span>24<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
 </pre></div>
 
 
 <p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="nb">import</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">apache_1</span><span class="mf">.3.24</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">gpg</span> <span class="o">--</span><span class="n">import</span> <span class="n">KEYS</span>
+$ <span class="n">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">apache_1</span><span class="p">.</span>3<span class="p">.</span>24<span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
 </pre></div>
 
 
-<p>Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included in many unix distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/freeware/console/], or [here|http://www.slavasoft.com/fsum/">here</a>.</p>
+<p>Alternatively, you can verify the MD5 signature on the files. A unix program called md5 or md5sum is included in many unix distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/freeware/console/],%20or%20[here|http://www.slavasoft.com/fsum/">here</a>.</p>
 
 
 

Modified: websites/staging/directory/trunk/content/api/groovy-api/2-groovy-ldap-user-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/api/groovy-api/2-groovy-ldap-user-guide.html (original)
+++ websites/staging/directory/trunk/content/api/groovy-api/2-groovy-ldap-user-guide.html Fri Jun 21 10:04:38 2013
@@ -222,11 +222,11 @@
 
 <p>In the <em>assert</em> expressions, the <em>exists</em> method of Groovy LDAP is used. It checks whether an entry with this DN already exists (see below). </p>
 <p>If no error occurs, the script adds the following entry to the directory:</p>
-<div class="codehilite"><pre><span class="err">dn:</span> <span class="err">cn=Heather</span> <span class="err">Nova,dc=example,dc=com</span>
-<span class="err">cn:</span> <span class="err">Heather</span> <span class="err">Nova</span>
-<span class="err">sn:</span> <span class="err">Nova</span>
-<span class="err">objectClass:</span> <span class="err">person</span>
-<span class="err">objectClass:</span> <span class="err">top</span>
+<div class="codehilite"><pre><span class="n">dn</span><span class="o">:</span> <span class="n">cn</span><span class="o">=</span><span class="n">Heather</span> <span class="n">Nova</span><span class="o">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="o">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span>
+<span class="n">cn</span><span class="o">:</span> <span class="n">Heather</span> <span class="n">Nova</span>
+<span class="n">sn</span><span class="o">:</span> <span class="n">Nova</span>
+<span class="n">objectClass</span><span class="o">:</span> <span class="n">person</span>
+<span class="n">objectClass</span><span class="o">:</span> <span class="n">top</span>
 </pre></div>
 
 
@@ -262,10 +262,10 @@
 
 
 <p>The output looks like:</p>
-<div class="codehilite"><pre><span class="mi">3</span> <span class="n">entries</span> <span class="n">found:</span>
-<span class="n">cn</span><span class="o">=</span><span class="n">Tori</span> <span class="n">Amos</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span>
-<span class="n">cn</span><span class="o">=</span><span class="n">Kate</span> <span class="n">Bush</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span>
-<span class="n">cn</span><span class="o">=</span><span class="n">Heather</span> <span class="n">Nova</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span>
+<div class="codehilite"><pre>3 <span class="n">entries</span> <span class="n">found</span><span class="p">:</span>
+<span class="n">cn</span><span class="p">=</span><span class="n">Tori</span> <span class="n">Amos</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">com</span>
+<span class="n">cn</span><span class="p">=</span><span class="n">Kate</span> <span class="n">Bush</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">com</span>
+<span class="n">cn</span><span class="p">=</span><span class="n">Heather</span> <span class="n">Nova</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">com</span>
 </pre></div>
 
 
@@ -323,13 +323,13 @@
 
 <p>The second call uses a list <em>mods</em> of modifications as an argument; each modification consists of a list of two elements (a pair): the modification type and a map with the attribute(s). </p>
 <p>Afterwards, the entry looks like this in the directory</p>
-<div class="codehilite"><pre><span class="err">dn:</span> <span class="err">cn=Heather</span> <span class="err">Nova,dc=example,dc=com</span>
-<span class="err">cn:</span> <span class="err">Heather</span> <span class="err">Nova</span>
-<span class="err">sn:</span> <span class="err">Nova</span>
-<span class="err">objectClass:</span> <span class="err">person</span>
-<span class="err">objectClass:</span> <span class="err">top</span>
-<span class="err">userpassword:</span> <span class="err">secret</span>
-<span class="err">description:</span> <span class="err">a</span> <span class="err">singer-songwriter,</span> <span class="err">born</span> <span class="err">in</span> <span class="err">Bermuda</span>
+<div class="codehilite"><pre><span class="n">dn</span><span class="o">:</span> <span class="n">cn</span><span class="o">=</span><span class="n">Heather</span> <span class="n">Nova</span><span class="o">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="o">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span>
+<span class="n">cn</span><span class="o">:</span> <span class="n">Heather</span> <span class="n">Nova</span>
+<span class="n">sn</span><span class="o">:</span> <span class="n">Nova</span>
+<span class="n">objectClass</span><span class="o">:</span> <span class="n">person</span>
+<span class="n">objectClass</span><span class="o">:</span> <span class="n">top</span>
+<span class="n">userpassword</span><span class="o">:</span> <span class="n">secret</span>
+<span class="n">description</span><span class="o">:</span> <span class="n">a</span> <span class="n">singer</span><span class="o">-</span><span class="n">songwriter</span><span class="o">,</span> <span class="n">born</span> <span class="k">in</span> <span class="n">Bermuda</span>
 </pre></div>
 
 
@@ -354,9 +354,9 @@
 
 
 <p>The output (if this entry exists) is:</p>
-<div class="codehilite"><pre><span class="err">DN:</span> <span class="err">cn=Heather</span> <span class="err">Nova,dc=example,dc=com</span>
-<span class="err">Common</span> <span class="err">name:</span> <span class="err">Heather</span> <span class="err">Nova</span>
-<span class="err">Object</span> <span class="kd">class</span><span class="err">es:</span> <span class="err">[&quot;person&quot;,</span> <span class="err">&quot;top&quot;]</span>
+<div class="codehilite"><pre><span class="n">DN</span><span class="o">:</span> <span class="n">cn</span><span class="o">=</span><span class="n">Heather</span> <span class="n">Nova</span><span class="o">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="o">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span>
+<span class="n">Common</span> <span class="n">name</span><span class="o">:</span> <span class="n">Heather</span> <span class="n">Nova</span>
+<span class="n">Object</span> <span class="n">classes</span><span class="o">:</span> <span class="o">[</span><span class="s2">&quot;person&quot;</span><span class="o">,</span> <span class="s2">&quot;top&quot;</span><span class="o">]</span>
 </pre></div>
 
 

Modified: websites/staging/directory/trunk/content/api/groovy-api/3-groovy-ldap-implementation.html
==============================================================================
--- websites/staging/directory/trunk/content/api/groovy-api/3-groovy-ldap-implementation.html (original)
+++ websites/staging/directory/trunk/content/api/groovy-api/3-groovy-ldap-implementation.html Fri Jun 21 10:04:38 2013
@@ -144,16 +144,16 @@
 <p>Source code of the proof of concept is currently available for review here :</p>
 <p><a href="http://svn.apache.org/repos/asf/directory/sandbox/szoerner/groovyldap">http://svn.apache.org/repos/asf/directory/sandbox/szoerner/groovyldap</a></p>
 <p>In order to check it out, simply type</p>
-<div class="codehilite"><pre><span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">&gt;</span><span class="n">svn</span> <span class="n">co</span> <span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/directory/s</span><span class="n">andbox</span><span class="sr">/szoerner/g</span><span class="n">roovyldap</span>
+<div class="codehilite"><pre><span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">&gt;</span><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">directory</span><span class="o">/</span><span class="n">sandbox</span><span class="o">/</span><span class="n">szoerner</span><span class="o">/</span><span class="n">groovyldap</span>
 <span class="n">A</span>    <span class="n">groovyldap</span><span class="o">\</span><span class="n">src</span>
 <span class="n">A</span>    <span class="n">groovyldap</span><span class="o">\</span><span class="n">src</span><span class="o">\</span><span class="n">main</span>
 <span class="n">A</span>    <span class="n">groovyldap</span><span class="o">\</span><span class="n">src</span><span class="o">\</span><span class="n">main</span><span class="o">\</span><span class="n">java</span>
 <span class="n">A</span>    <span class="n">groovyldap</span><span class="o">\</span><span class="n">src</span><span class="o">\</span><span class="n">main</span><span class="o">\</span><span class="n">java</span><span class="o">\</span><span class="n">org</span>
 <span class="n">A</span>    <span class="n">groovyldap</span><span class="o">\</span><span class="n">src</span><span class="o">\</span><span class="n">main</span><span class="o">\</span><span class="n">java</span><span class="o">\</span><span class="n">org</span><span class="o">\</span><span class="n">apache</span>
-<span class="o">...</span>
-<span class="n">Checked</span> <span class="n">out</span> <span class="n">revision</span> <span class="mi">558335</span><span class="o">.</span>
+<span class="p">...</span>
+<span class="n">Checked</span> <span class="n">out</span> <span class="n">revision</span> 558335<span class="p">.</span>
 
-<span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">&gt;</span><span class="n">_</span>
+<span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">&gt;</span><span class="n">_</span>
 </pre></div>
 
 

Modified: websites/staging/directory/trunk/content/api/groovy-api/4-groovy-ldap-building.html
==============================================================================
--- websites/staging/directory/trunk/content/api/groovy-api/4-groovy-ldap-building.html (original)
+++ websites/staging/directory/trunk/content/api/groovy-api/4-groovy-ldap-building.html Fri Jun 21 10:04:38 2013
@@ -144,26 +144,26 @@
 <p>In order to build the software, Apache ant is used. For dependency resolution we use <a href="http://incubator.apache.org/ivy">Ivy</a>. You need to configure your ant tool to use Ivy. One option is to place the corresponding jar file <em>ivy-1.4.1.jar</em> (or later) in the <em>lib</em> folder of your ant distribution.</p>
 <h3 id="building-with-ant-and-ivy-deprecated">Building with ant and ivy (deprecated)</h3>
 <p>Simply change to the <em>groovyldap</em> directory and type <em>ant</em>.</p>
-<div class="codehilite"><pre><span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">&gt;</span><span class="n">cd</span> <span class="n">groovyldap</span>
-<span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">&gt;</span><span class="n">ant</span>
-<span class="n">Buildfile:</span> <span class="n">build</span><span class="o">.</span><span class="n">xml</span>
-
-<span class="n">prepare:</span>
-    <span class="p">[</span><span class="nb">mkdir</span><span class="p">]</span> <span class="n">Created</span> <span class="n">dir:</span> <span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">\</span><span class="n">dist</span>
-    <span class="p">[</span><span class="nb">mkdir</span><span class="p">]</span> <span class="n">Created</span> <span class="n">dir:</span> <span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">\</span><span class="n">dist</span><span class="o">\</span><span class="n">classes</span>
-    <span class="p">[</span><span class="nb">mkdir</span><span class="p">]</span> <span class="n">Created</span> <span class="n">dir:</span> <span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">\</span><span class="n">lib</span>
+<div class="codehilite"><pre><span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">&gt;</span><span class="n">cd</span> <span class="n">groovyldap</span>
+<span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">&gt;</span><span class="n">ant</span>
+<span class="n">Buildfile</span><span class="p">:</span> <span class="n">build</span><span class="p">.</span><span class="n">xml</span>
+
+<span class="n">prepare</span><span class="p">:</span>
+    <span class="p">[</span><span class="n">mkdir</span><span class="p">]</span> <span class="n">Created</span> <span class="n">dir</span><span class="p">:</span> <span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">\</span><span class="n">dist</span>
+    <span class="p">[</span><span class="n">mkdir</span><span class="p">]</span> <span class="n">Created</span> <span class="n">dir</span><span class="p">:</span> <span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">\</span><span class="n">dist</span><span class="o">\</span><span class="n">classes</span>
+    <span class="p">[</span><span class="n">mkdir</span><span class="p">]</span> <span class="n">Created</span> <span class="n">dir</span><span class="p">:</span> <span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">\</span><span class="n">lib</span>
 
-<span class="n">resolve:</span>
-<span class="p">[</span><span class="n">ivy:retrieve</span><span class="p">]</span> <span class="o">::</span> <span class="n">Ivy</span> <span class="mf">1.4.1</span> <span class="o">-</span> <span class="mi">20061109165313</span> <span class="o">::</span> <span class="n">http:</span><span class="sr">//i</span><span class="n">vy</span><span class="o">.</span><span class="n">jayasoft</span><span class="o">.</span><span class="n">org</span><span class="o">/</span> <span class="o">::</span>
+<span class="n">resolve</span><span class="p">:</span>
+<span class="p">[</span><span class="n">ivy</span><span class="p">:</span><span class="n">retrieve</span><span class="p">]</span> <span class="p">::</span> <span class="n">Ivy</span> 1<span class="p">.</span>4<span class="p">.</span>1 <span class="o">-</span> 20061109165313 <span class="p">::</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">ivy</span><span class="p">.</span><span class="n">jayasoft</span><span class="p">.</span><span class="n">org</span><span class="o">/</span> <span class="p">::</span>
 
-<span class="o">...</span>
+<span class="p">...</span>
 
-<span class="n">jarfile:</span>
-      <span class="p">[</span><span class="n">jar</span><span class="p">]</span> <span class="n">Building</span> <span class="n">jar:</span> <span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">\</span><span class="n">dist</span><span class="o">\</span><span class="n">groovy</span><span class="o">-</span><span class="n">ldap</span><span class="o">.</span><span class="n">jar</span>
+<span class="n">jarfile</span><span class="p">:</span>
+      <span class="p">[</span><span class="n">jar</span><span class="p">]</span> <span class="n">Building</span> <span class="n">jar</span><span class="p">:</span> <span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">\</span><span class="n">dist</span><span class="o">\</span><span class="n">groovy</span><span class="o">-</span><span class="n">ldap</span><span class="p">.</span><span class="n">jar</span>
 
 <span class="n">BUILD</span> <span class="n">SUCCESSFUL</span>
-<span class="n">Total</span> <span class="nb">time</span><span class="p">:</span> <span class="mi">7</span> <span class="n">seconds</span>
-<span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">&gt;</span><span class="n">_</span>
+<span class="n">Total</span> <span class="n">time</span><span class="p">:</span> 7 <span class="n">seconds</span>
+<span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">&gt;</span><span class="n">_</span>
 </pre></div>
 
 
@@ -172,19 +172,19 @@
 <h3 id="building-with-maven">Building with Maven</h3>
 <p>We are changing the build process to Maven 2, in order to have the same build tool for all sub projects within Apache Directory. </p>
 <p>Simply change to the <em>groovyldap</em> directory and type <em>mvn install</em>.</p>
-<div class="codehilite"><pre><span class="n">D:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">&gt;</span><span class="n">mvn</span> <span class="n">install</span>
-<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Scanning</span> <span class="k">for</span> <span class="n">projects</span><span class="o">...</span>
+<div class="codehilite"><pre><span class="n">D</span><span class="p">:</span><span class="o">\</span><span class="n">Apache</span><span class="o">\</span><span class="n">groovyldap</span><span class="o">&gt;</span><span class="n">mvn</span> <span class="n">install</span>
+<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Scanning</span> <span class="k">for</span> <span class="n">projects</span><span class="p">...</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="o">-----------------------------------------------------------------</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Building</span> <span class="n">Apache</span> <span class="n">Directory</span> <span class="n">Groovy</span> <span class="n">LDAP</span>
-<span class="p">[</span><span class="n">INFO</span><span class="p">]</span>    <span class="n">task</span><span class="o">-</span><span class="n">segment:</span> <span class="p">[</span><span class="n">install</span><span class="p">]</span>
+<span class="p">[</span><span class="n">INFO</span><span class="p">]</span>    <span class="n">task</span><span class="o">-</span><span class="n">segment</span><span class="p">:</span> <span class="p">[</span><span class="n">install</span><span class="p">]</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="o">-----------------------------------------------------------------</span>
-<span class="o">...</span>
+<span class="p">...</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="o">-----------------------------------------------------------------</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">BUILD</span> <span class="n">SUCCESSFUL</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="o">-----------------------------------------------------------------</span>
-<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Total</span> <span class="nb">time</span><span class="p">:</span> <span class="mi">25</span> <span class="n">seconds</span>
-<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Finished</span> <span class="n">at:</span> <span class="n">Mon</span> <span class="n">Mar</span> <span class="mo">02</span> <span class="mi">22</span><span class="p">:</span><span class="mo">06</span><span class="p">:</span><span class="mi">54</span> <span class="n">CET</span> <span class="mi">2009</span>
-<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Final</span> <span class="n">Memory:</span> <span class="mi">19</span><span class="n">M</span><span class="o">/</span><span class="mi">38</span><span class="n">M</span>
+<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Total</span> <span class="n">time</span><span class="p">:</span> 25 <span class="n">seconds</span>
+<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Finished</span> <span class="n">at</span><span class="p">:</span> <span class="n">Mon</span> <span class="n">Mar</span> 02 22<span class="p">:</span>06<span class="p">:</span>54 <span class="n">CET</span> 2009
+<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Final</span> <span class="n">Memory</span><span class="p">:</span> 19<span class="n">M</span><span class="o">/</span>38<span class="n">M</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="o">-----------------------------------------------------------------</span>
 </pre></div>
 

Modified: websites/staging/directory/trunk/content/api/groovy-ldap.html
==============================================================================
--- websites/staging/directory/trunk/content/api/groovy-ldap.html (original)
+++ websites/staging/directory/trunk/content/api/groovy-ldap.html Fri Jun 21 10:04:38 2013
@@ -150,17 +150,17 @@
 <p>Here are two example scripts which use Groovy LDAP in order to give you a first impression. Learn more about how to use Groovy LDAP in the <a href="groovy-ldap-user-guide.html">User Guide</a>.</p>
 <h3 id="adding-an-entry">Adding an entry</h3>
 <p>The attribute values of an LDAP entry can be defined with the help of the expressive Map syntax of Groovy ([DIRxSBOX:...)). The following script uses the add operation to create a new entry in the directory:</p>
-<div class="codehilite"><pre><span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">directory</span><span class="o">.</span><span class="n">groovyldap</span><span class="o">.</span><span class="n">LDAP</span>
+<div class="codehilite"><pre><span class="kn">import</span> <span class="nn">org.apache.directory.groovyldap.LDAP</span>
 
-<span class="n">ldap</span> <span class="o">=</span> <span class="n">LDAP</span><span class="o">.</span><span class="n">newInstance</span><span class="p">(</span><span class="s">&#39;ldap://zanzibar:10389&#39;</span><span class="p">,</span> <span class="s">&#39;uid=admin,ou=system&#39;</span><span class="p">,</span> <span class="s">&#39;******&#39;</span><span class="p">)</span>
+<span class="n">ldap</span> <span class="o">=</span> <span class="n">LDAP</span><span class="o">.</span><span class="na">newInstance</span><span class="o">(</span><span class="s1">&#39;ldap://zanzibar:10389&#39;</span><span class="o">,</span> <span class="s1">&#39;uid=admin,ou=system&#39;</span><span class="o">,</span> <span class="s1">&#39;******&#39;</span><span class="o">)</span>
 
-<span class="n">heather</span> <span class="o">=</span> <span class="p">[</span>
-  <span class="n">objectclass:</span> <span class="p">[</span><span class="s">&#39;top&#39;</span><span class="p">,</span> <span class="s">&#39;person&#39;</span><span class="p">],</span>              
-  <span class="n">sn:</span> <span class="s">&#39;Nova&#39;</span><span class="p">,</span>
-  <span class="n">cn:</span> <span class="s">&#39;Heather Nova&#39;</span>
-<span class="p">]</span>
+<span class="n">heather</span> <span class="o">=</span> <span class="o">[</span>
+  <span class="nl">objectclass:</span> <span class="o">[</span><span class="s1">&#39;top&#39;</span><span class="o">,</span> <span class="s1">&#39;person&#39;</span><span class="o">],</span>              
+  <span class="nl">sn:</span> <span class="s1">&#39;Nova&#39;</span><span class="o">,</span>
+  <span class="nl">cn:</span> <span class="s1">&#39;Heather Nova&#39;</span>
+<span class="o">]</span>
 
-<span class="n">ldap</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="s">&#39;cn=Heather Nova,dc=example,dc=com&#39;</span><span class="p">,</span> <span class="n">heather</span><span class="p">)</span>
+<span class="n">ldap</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="s1">&#39;cn=Heather Nova,dc=example,dc=com&#39;</span><span class="o">,</span> <span class="n">heather</span><span class="o">)</span>
 </pre></div>
 
 
@@ -175,21 +175,21 @@ objectClass: top
 
 <h3 id="performing-an-ldap-search-with-a-closure">Performing an LDAP search with a closure</h3>
 <p>Besides the operations found in the classic LDAP API, Groovy LDAP provides advanced functionality with the help of features specific to the Groovy language. Here is an example which performs a search operation, and executes the behavior given via a closure for each entry found:</p>
-<div class="codehilite"><pre>import org.apache.directory.groovyldap.LDAP
+<div class="codehilite"><pre><span class="kn">import</span> <span class="nn">org.apache.directory.groovyldap.LDAP</span>
 
-ldap = LDAP.newInstance(&#39;ldap://zanzibar:10389/dc=example,dc=com&#39;)
+<span class="n">ldap</span> <span class="o">=</span> <span class="n">LDAP</span><span class="o">.</span><span class="na">newInstance</span><span class="o">(</span><span class="s1">&#39;ldap://zanzibar:10389/dc=example,dc=com&#39;</span><span class="o">)</span>
 
-ldap.eachEntry (filter: &#39;(objectClass=person)&#39;) { entry -&gt;  
-    println &quot;<span class="cp">${</span><span class="n">entry</span><span class="o">.</span><span class="n">cn</span><span class="cp">}</span> (<span class="cp">${</span><span class="n">entry</span><span class="o">.</span><span class="n">dn</span><span class="cp">}</span>)&quot;
-}
+<span class="n">ldap</span><span class="o">.</span><span class="na">eachEntry</span> <span class="o">(</span><span class="nl">filter:</span> <span class="s1">&#39;(objectClass=person)&#39;</span><span class="o">)</span> <span class="o">{</span> <span class="n">entry</span> <span class="o">-&gt;</span>  
+    <span class="n">println</span> <span class="s2">&quot;${entry.cn} (${entry.dn})&quot;</span>
+<span class="o">}</span>
 </pre></div>
 
 
 <p>The example also shows how to access attributes and the distinguished name (DN) of an entry (Map syntax, as well). The output looks like this:</p>
-<div class="codehilite"><pre><span class="n">Tori</span> <span class="n">Amos</span> <span class="p">(</span><span class="n">cn</span><span class="o">=</span><span class="n">Tori</span> <span class="n">Amos</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span><span class="p">)</span>
-<span class="n">Kate</span> <span class="n">Bush</span> <span class="p">(</span><span class="n">cn</span><span class="o">=</span><span class="n">Kate</span> <span class="n">Bush</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span><span class="p">)</span>
-<span class="n">Heather</span> <span class="n">Nova</span> <span class="p">(</span><span class="n">cn</span><span class="o">=</span><span class="n">Heather</span> <span class="n">Nova</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="o">=</span><span class="n">com</span><span class="p">)</span>
-<span class="o">...</span>
+<div class="codehilite"><pre><span class="n">Tori</span> <span class="n">Amos</span> <span class="p">(</span><span class="n">cn</span><span class="p">=</span><span class="n">Tori</span> <span class="n">Amos</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">com</span><span class="p">)</span>
+<span class="n">Kate</span> <span class="n">Bush</span> <span class="p">(</span><span class="n">cn</span><span class="p">=</span><span class="n">Kate</span> <span class="n">Bush</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">com</span><span class="p">)</span>
+<span class="n">Heather</span> <span class="n">Nova</span> <span class="p">(</span><span class="n">cn</span><span class="p">=</span><span class="n">Heather</span> <span class="n">Nova</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">example</span><span class="p">,</span><span class="n">dc</span><span class="p">=</span><span class="n">com</span><span class="p">)</span>
+<span class="p">...</span>
 </pre></div>
 
 

Modified: websites/staging/directory/trunk/content/api/user-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide.html Fri Jun 21 10:04:38 2013
@@ -119,13 +119,16 @@
 
 
 <h1 id="users-guide">Users guide</h1>
-<p><DIV class="note" markdown="1">
-<strong>Work in progress</strong></p>
-<p>This is a very preliminary version...</p>
-<p>Pages with a (e) at the end of the title are empty pages
+<DIV class="note" markdown="1">
+**Work in progress**
+
+This is a very preliminary version...
+
+Pages with a (e) at the end of the title are empty pages
 Pages with a (...) ate the end of the title are not completed yet
 Other pages are finished (but may be reviewed)
-</DIV></p>
+</DIV>
+
 <p>This documentation is about the newly LDAP API developped at the Apache Software Foundation. We expect this API will be a replacement for all the ancient API (<a href="http://www.openldap.org/jldap/">jLdap</a>, <a href="http://www.mozilla.org/directory/">Mozilla LDAP SDK</a> and <a href="http://www.oracle.com/technetwork/java/jndi/index.html">JNDI</a>).</p>
 <h2 id="about-this-guide">About this guide</h2>
 <p>Getting started. Learn how to use the LDAP API, connect to various LDAP server, manipulate the data within your directory. </p>

Modified: websites/staging/directory/trunk/content/api/user-guide/2.3-searching.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.3-searching.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/2.3-searching.html Fri Jun 21 10:04:38 2013
@@ -140,9 +140,10 @@
 <h1 id="23-searching">2.3 - Searching (...)</h1>
 <p>Searching is the most important operation in <strong>LDAP</strong>. It has to be fast, very fast. On the other hand, as the server does not a lot of processing while looking for entries, the client has to provide many information in order to get some accurate results.</p>
 <p>The idea is to define a search <strong>API</strong> which is easy to use in the simplest cases, but provides all the necessary bolts if you need to send complex search requests.</p>
-<p><DIV class="worning" markdown="1">
+<DIV class="worning" markdown="1">
 This part of the API is very likely to change in the next milestone, to provide an easier way to get the results in the simple cases.
-</DIV></p>
+</DIV>
+
 <h2 id="simple-search">Simple search</h2>
 <p>Let's first look at a simple search. What we basically need to process a search is a starting point in the tree, a filter, a scope. Here is an example :</p>
 <div class="codehilite"><pre><span class="nd">@Test</span>

Modified: websites/staging/directory/trunk/content/api/user-guide/2.4-adding.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.4-adding.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/2.4-adding.html Fri Jun 21 10:04:38 2013
@@ -263,10 +263,12 @@ Note that it is possible to use some var
 <p>There are also some other constraints, depending on the server, if it implements <strong><a href="">NameForms</a></strong>, <strong><a href="">DITStructureRules</a></strong> or <em><a href="">DITContentRules</a></em>*.</p>
 <p>One other reason your entry can be rejected is that you don't have enough privilege to add it. You have to check that the server configuration allows you to add an entry where you want to add it.</p>
 <h2 id="errors">Errors</h2>
-<p><DIV class="note" markdown="1">
-At first, you might expect to get an exception if the entry addition has failed. If the server is rejecting the addition, <em>you will get NO exception</em>. Exceptions are only thrown client side if the entry is not built correctly, or if the connection is not opened. </p>
-<p>In any other case, the server will simply return a <strong><a href="">LdapResult</a></strong> instance containing either <strong>SUCCESS</strong> or the cause of the rejection.
-</DIV></p>
+<DIV class="note" markdown="1">
+At first, you might expect to get an exception if the entry addition has failed. If the server is rejecting the addition, *you will get NO exception*. Exceptions are only thrown client side if the entry is not built correctly, or if the connection is not opened.
+
+In any other case, the server will simply return a **[LdapResult]()** instance containing either **SUCCESS** or the cause of the rejection.
+</DIV>
+
 <p>Usually, if you get an error while adding an entry, the message might be pretty tedious. Most of the cases it's because either your entry already exists, or because your entry has some schema violation.</p>
 <p>The <strong><a href="">LdapResult</a></strong> in the response will give you a clue about what going on.</p>
 

Modified: websites/staging/directory/trunk/content/api/user-guide/2.5-deleting.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.5-deleting.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/2.5-deleting.html Fri Jun 21 10:04:38 2013
@@ -177,6 +177,7 @@
 <span class="o">{</span>
     <span class="n">assertTrue</span><span class="o">(</span> <span class="n">session</span><span class="o">.</span><span class="na">exists</span><span class="o">(</span> <span class="s">&quot;cn=parent,ou=system&quot;</span> <span class="o">)</span> <span class="o">);</span>
 
+
     <span class="n">DeleteResponse</span> <span class="n">response</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">deleteTree</span><span class="o">(</span> <span class="s">&quot;cn=parent,ou=system&quot;</span> <span class="o">);</span>
     <span class="n">assertNotNull</span><span class="o">(</span> <span class="n">response</span> <span class="o">);</span>
     <span class="n">assertEquals</span><span class="o">(</span> <span class="n">ResultCodeEnum</span><span class="o">.</span><span class="na">SUCCESS</span><span class="o">,</span> <span class="n">response</span><span class="o">.</span><span class="na">getLdapResult</span><span class="o">().</span><span class="na">getResultCode</span><span class="o">()</span> <span class="o">);</span>



Mime
View raw message