directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r840745 - in /websites/staging/directory/trunk/content: ./ api/user-guide/
Date Tue, 04 Dec 2012 16:24:48 GMT
Author: buildbot
Date: Tue Dec  4 16:24:46 2012
New Revision: 840745

Log:
Staging update by buildbot for directory

Added:
    websites/staging/directory/trunk/content/api/user-guide/2.3-searching.html
    websites/staging/directory/trunk/content/api/user-guide/2.4-adding.html
    websites/staging/directory/trunk/content/api/user-guide/2.5-deleting.html
    websites/staging/directory/trunk/content/api/user-guide/2.6-modifying.html
    websites/staging/directory/trunk/content/api/user-guide/2.7-moving-renaming.html
    websites/staging/directory/trunk/content/api/user-guide/2.8-comparing.html
    websites/staging/directory/trunk/content/api/user-guide/2.9-exception-management.html
Modified:
    websites/staging/directory/trunk/content/   (props changed)
    websites/staging/directory/trunk/content/api/user-guide/2-basic-ldap-api-usage.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  4 16:24:46 2012
@@ -1 +1 @@
-1416994
+1417018

Modified: websites/staging/directory/trunk/content/api/user-guide/2-basic-ldap-api-usage.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2-basic-ldap-api-usage.html (original)
+++ websites/staging/directory/trunk/content/api/user-guide/2-basic-ldap-api-usage.html Tue Dec  4 16:24:46 2012
@@ -132,15 +132,15 @@
 * A third set allowing the user to send asynchronous requests.</p>
 <h2 id="contents">Contents</h2>
 <ul>
-<li><a href="2.1-connection-disconnection.html">Connection and disconnection</a></li>
-<li><a href="2.2-binding-unbinding.html">Binding and unbinding (...)</a></li>
-<li><a href="2.3-searching.html">Searching (...)</a></li>
-<li><a href="2.4-adding.html">Adding entries</a></li>
-<li><a href="2.5-deleting.html">Deleting entries</a></li>
-<li><a href="2.6-modifying.html">Modifying entries (e)</a></li>
-<li><a href="2.7-movind-renaming.html">Moving an renaming entries (e)</a></li>
-<li><a href="2.8-comparing.html">Comparing entries (e)</a></li>
-<li><a href="2.9-exception-management.html">Exception management (...)</a></li>
+<li><a href="2.1-connection-disconnection.html">2.1 - Connection and disconnection</a></li>
+<li><a href="2.2-binding-unbinding.html">2.2 - Binding and unbinding (...)</a></li>
+<li><a href="2.3-searching.html">2.3 - Searching (...)</a></li>
+<li><a href="2.4-adding.html">2.4 - Adding entries</a></li>
+<li><a href="2.5-deleting.html">2.5 - Deleting entries</a></li>
+<li><a href="2.6-modifying.html">2.6 - Modifying entries (e)</a></li>
+<li><a href="2.7-moving-renaming.html">2.7 - Moving an renaming entries (e)</a></li>
+<li><a href="2.8-comparing.html">2.8 - Comparing entries (e)</a></li>
+<li><a href="2.9-exception-management.html">2.9 - Exception management (...)</a></li>
 </ul>
 
 

Added: websites/staging/directory/trunk/content/api/user-guide/2.3-searching.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.3-searching.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/2.3-searching.html Tue Dec  4 16:24:46 2012
@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>2.3 - Searching &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>Apache LDAP API</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Latest Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.2-binding-unbinding.html">2.2 - Binding and unbinding</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.4-adding.html">2.4 - Adding entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<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">
+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>
+<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>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">testSimpleSearch</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span>
+<span class="o">{</span>
+    <span class="n">SearchCursor</span> <span class="n">cursor</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">search</span><span class="o">(</span> <span class="s">&quot;ou=system&quot;</span><span class="o">,</span> <span class="s">&quot;(objectclass=*)&quot;</span><span class="o">,</span> <span class="n">SearchScope</span><span class="o">.</span><span class="na">ONELEVEL</span> <span class="o">);</span>
+
+    <span class="k">while</span> <span class="o">(</span> <span class="n">cursor</span><span class="o">.</span><span class="na">next</span><span class="o">()</span> <span class="o">)</span>
+    <span class="o">{</span>
+        <span class="n">Response</span> <span class="n">response</span> <span class="o">=</span> <span class="n">cursor</span><span class="o">.</span><span class="na">get</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">assertTrue</span><span class="o">(</span> <span class="n">response</span> <span class="k">instanceof</span> <span class="n">SearchResultEntry</span> <span class="o">);</span>
+        <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="o">((</span><span class="n">SearchResultEntry</span><span class="o">)</span><span class="n">response</span><span class="o">).</span><span class="na">getEntry</span><span class="o">()</span> <span class="o">);</span>
+    <span class="o">}</span>
+
+    <span class="n">SearchResultDone</span> <span class="n">done</span> <span class="o">=</span> <span class="n">cursor</span><span class="o">.</span><span class="na">getSearchResultDone</span><span class="o">();</span>
+
+    <span class="n">assertNotNull</span><span class="o">(</span> <span class="n">done</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">done</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>
+
+    <span class="n">cursor</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
+<span class="o">}</span>
+</pre></div>
+
+
+<p>In this example, the <em>connection</em> has been previously created. We just search for all the entries starting at <em>ou=system</em> and their children, which have an <em>ObjectClass</em> attribute (all the entries have such an attribute, so we should get back all the entries). The scope (<em>ONELEVEL</em>) says we just search one level under the starting base.</p>
+<p>We get back a cursor, which can be walked forward. Every call to the <em>get()</em> method will return a response, which will be either a <em>SearchResultEntry</em>, a <em>SearchResultReference</em> or an <em>IntermediateResponse</em>.</p>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.2-binding-unbinding.html">2.2 - Binding and unbinding</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.4-adding.html">2.4 - Adding entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/2.4-adding.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.4-adding.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/2.4-adding.html Tue Dec  4 16:24:46 2012
@@ -0,0 +1,291 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>2.4 - Adding entries &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>Apache LDAP API</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Latest Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.3-searching.html">2.3 Searching</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.5-deleting.html">2.5 - Deleting entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="24-adding-entries">2.4 - Adding entries</h1>
+<p>Adding entries is one of the base operation a user can do on a <strong>LDAP</strong> server. Nevertheless, such an operation implies a lot of checks, and frequently the user gets some weird error messages. We will see how we can add an entry using the <strong>LDAP API</strong>, and then analyze the different error cases we can face.</p>
+<h2 id="adding-an-entry">Adding an entry</h2>
+<p>We will first see the easiest way to add an entry into the server, assuming that the entry is correct. In order to add an entry, you only have to provide the place where this entry will be stored (its <strong><a href="">Dn</a></strong>) and the list of its <strong><a href="">Attributes</a></strong>.</p>
+<p>Here is two examples where we inject the entry using <strong>LDIF</strong> :</p>
+<div class="codehilite"><pre><span class="nd">@Test</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">testAddLdif</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span>
+<span class="o">{</span>
+    <span class="n">AddResponse</span> <span class="n">response</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">add</span><span class="o">(</span> 
+        <span class="k">new</span> <span class="nf">DefaultEntry</span><span class="o">(</span> 
+            <span class="s">&quot;cn=testadd,ou=system&quot;</span><span class="o">,</span>    <span class="c1">// The Dn</span>
+            <span class="s">&quot;ObjectClass: top&quot;</span><span class="o">,</span>
+            <span class="s">&quot;ObjectClass: person&quot;</span><span class="o">,</span>
+            <span class="s">&quot;cn: testadd_cn&quot;</span><span class="o">,</span>
+            <span class="s">&quot;sn: testadd_sn&quot;</span>
+            <span class="o">)</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>
+
+    <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=testadd,ou=system&quot;</span> <span class="o">)</span> <span class="o">);</span>
+<span class="o">}</span>
+</pre></div>
+
+
+<p>In this basic example, we are adding a new entry, created using some <strong>LDIF</strong> formatted parameters, the first one being the entry's Dn.
+Note that it is possible to use some variables in the <strong>LDIF</strong> instead of pure text. Here is the same example, resulting to the same entry being added:</p>
+<div class="codehilite"><pre><span class="nd">@Test</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">testAddLdif</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span>
+<span class="o">{</span>
+    <span class="n">String</span> <span class="n">cn</span> <span class="o">=</span> <span class="s">&quot;testadd_cn&quot;</span><span class="o">;</span>
+    <span class="n">String</span> <span class="n">sn</span> <span class="o">=</span> <span class="s">&quot;testadd_sn&quot;</span><span class="o">;</span>
+
+    <span class="n">AddResponse</span> <span class="n">response</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">add</span><span class="o">(</span> 
+        <span class="k">new</span> <span class="nf">DefaultEntry</span><span class="o">(</span> 
+            <span class="s">&quot;cn=testadd,ou=system&quot;</span><span class="o">,</span>    <span class="c1">// The Dn</span>
+            <span class="s">&quot;ObjectClass: top&quot;</span><span class="o">,</span>
+            <span class="s">&quot;ObjectClass: person&quot;</span><span class="o">,</span>
+            <span class="s">&quot;cn&quot;</span><span class="o">,</span> <span class="n">cn</span><span class="o">,</span>                  <span class="c1">// Note : there is no &#39;:&#39; when using a variable</span>
+            <span class="s">&quot;sn&quot;</span><span class="o">,</span> <span class="n">sn</span>
+            <span class="o">)</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>
+
+    <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=testadd,ou=system&quot;</span> <span class="o">)</span> <span class="o">);</span>
+<span class="o">}</span>
+</pre></div>
+
+
+<p>Down the line, what is important is that the <em>add()</em> operation is taking a full <strong><a href="">Entry</a></strong>. </p>
+<p>We can also create the <strong><a href="">Entry</a></strong> in a different way, which will be exposed in the following paragraphs.</p>
+<h2 id="sending-an-addrequest">Sending an <strong><a href="">AddRequest</a></strong></h2>
+<p>Sometimes, we want more control. We can ask the server to add an entry by sending an <strong><a href="">AddRequest</a></strong>, which allows you to send a <strong><a href="">Control</a></strong> at the same time.</p>
+<p>Here is an example (note that the control is just injected to demonstrate the feature, it simply does nothing in this case):</p>
+<div class="codehilite"><pre><span class="nd">@Test</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">testAddWithControl</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span>
+<span class="o">{</span>
+    <span class="n">assertFalse</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=testadd,ou=system&quot;</span> <span class="o">)</span> <span class="o">);</span>
+
+    <span class="n">Entry</span> <span class="n">entry</span> <span class="o">=</span> <span class="k">new</span> <span class="n">DefaultEntry</span><span class="o">(</span> 
+        <span class="s">&quot;cn=testadd,ou=system&quot;</span><span class="o">,</span>
+        <span class="s">&quot;ObjectClass : top&quot;</span><span class="o">,</span>
+        <span class="s">&quot;ObjectClass : person&quot;</span><span class="o">,</span>
+        <span class="s">&quot;cn: testadd_sn&quot;</span><span class="o">,</span>
+        <span class="s">&quot;sn: testadd_sn&quot;</span>
+        <span class="o">);</span>
+
+    <span class="n">AddRequest</span> <span class="n">addRequest</span> <span class="o">=</span> <span class="k">new</span> <span class="n">AddRequestImpl</span><span class="o">();</span>
+    <span class="n">addRequest</span><span class="o">.</span><span class="na">setEntry</span><span class="o">(</span> <span class="n">entry</span> <span class="o">);</span>
+    <span class="n">addRequest</span><span class="o">.</span><span class="na">addControl</span><span class="o">(</span> <span class="k">new</span> <span class="n">ManageDsaITImpl</span><span class="o">()</span> <span class="o">);</span>
+
+    <span class="n">AddResponse</span> <span class="n">response</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">add</span><span class="o">(</span> <span class="n">addRequest</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>
+
+    <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=testadd,ou=system&quot;</span> <span class="o">)</span> <span class="o">);</span>
+<span class="o">}</span>
+</pre></div>
+
+
+<h3 id="asynchronous-addition">Asynchronous addition</h3>
+<p>Some may want to add an entry, but will not check the result immediately. It's just a matter of calling the <em>addAsync()</em> method, which will return a <em>Future</em> that can be checked somewhere else in the code:</p>
+<div class="codehilite"><pre><span class="nd">@Test</span>
+<span class="kd">public</span> <span class="kt">void</span> <span class="nf">testAddAsyncLdif</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">Exception</span>
+<span class="o">{</span>
+    <span class="n">Entry</span> <span class="n">entry</span> <span class="o">=</span> <span class="k">new</span> <span class="n">DefaultEntry</span><span class="o">(</span> 
+        <span class="s">&quot;cn=testAsyncAdd,ou=system&quot;</span><span class="o">,</span>
+        <span class="s">&quot;ObjectClass: top&quot;</span><span class="o">,</span>
+        <span class="s">&quot;ObjectClass: person&quot;</span><span class="o">,</span>
+        <span class="s">&quot;cn: testAsyncAdd_cn&quot;</span><span class="o">,</span>
+        <span class="s">&quot;sn: testAsyncAdd_sn&quot;</span> <span class="o">);</span>
+
+    <span class="n">assertFalse</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=testAsyncAdd,ou=system&quot;</span> <span class="o">)</span> <span class="o">);</span>
+    <span class="n">AddRequest</span> <span class="n">addRequest</span> <span class="o">=</span> <span class="k">new</span> <span class="n">AddRequestImpl</span><span class="o">();</span>
+    <span class="n">addRequest</span><span class="o">.</span><span class="na">setEntry</span><span class="o">(</span> <span class="n">entry</span> <span class="o">);</span>
+
+    <span class="n">AddFuture</span> <span class="n">addFuture</span> <span class="o">=</span> <span class="n">connection</span><span class="o">.</span><span class="na">addAsync</span><span class="o">(</span> <span class="n">addRequest</span> <span class="o">);</span>
+
+    <span class="c1">// Here, we can do something else before checking that the entry has been added</span>
+
+    <span class="n">AddResponse</span> <span class="n">addResponse</span> <span class="o">=</span> <span class="n">addFuture</span><span class="o">.</span><span class="na">get</span><span class="o">(</span> <span class="mi">1000</span><span class="o">,</span> <span class="n">TimeUnit</span><span class="o">.</span><span class="na">MILLISECONDS</span> <span class="o">);</span>
+
+    <span class="n">assertNotNull</span><span class="o">(</span> <span class="n">addResponse</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">addResponse</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>
+    <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=testAsyncAdd,ou=system&quot;</span> <span class="o">)</span> <span class="o">);</span>
+<span class="o">}</span>
+</pre></div>
+
+
+<h2 id="do-dont">Do, Don't</h2>
+<p>Successfully adding an entry assume that the entry is correct, ie that the attributes and the value are compatible with the schema. There are many things checked by the server. Here is a list of constraints that you should respect in order to get your entry injected:</p>
+<ul>
+<li>The entry must have at least one <strong>Structural</strong> <strong><a href="">ObjectClass</a></strong></li>
+<li>If the entry has more than one <strong>Structural</strong> <strong><a href="">ObjectClass</a></strong>, then they must be hierarchically related</li>
+<li>The <em>[DIRAPI:ObjectClass]es</em> define the list of allowed <strong>Structural</strong> <strong><a href="">AttributeTypes</a></strong> that can be used (<strong>MAY</strong> and <strong>MUST</strong>)</li>
+<li>All the <strong>MUST</strong> <strong><a href="">AttributeTypes</a></strong> must be present</li>
+<li>Each added value must follow the <strong>[DIRAPI:AttributeType]</strong> <strong><a href="">Syntax</a></strong></li>
+<li>If the <strong>[DIRAPI:AttributeType]</strong> is single valued, then you can't add more than one value</li>
+<li>The entry's <strong><a href="">Dn</a></strong> must have a parent</li>
+<li>You are not allowed as a user to inject operational attributes, unless they have the <strong>USER-MODIFICATION</strong> flag set to true.</li>
+</ul>
+<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>
+<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>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.3-searching.html">2.3 Searching</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.5-deleting.html">2.5 - Deleting entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/2.5-deleting.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.5-deleting.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/2.5-deleting.html Tue Dec  4 16:24:46 2012
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>2.5 - Deleting entries &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>Apache LDAP API</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Latest Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.4-adding.html">2.4 - Adding entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.6-modifying.html">2.6 - Modifying entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="25-deleting-entries">2.5 - Deleting entries</h1>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.4-adding.html">2.4 - Adding entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.6-modifying.html">2.6 - Modifying entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/2.6-modifying.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.6-modifying.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/2.6-modifying.html Tue Dec  4 16:24:46 2012
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>2.6 - Modifying entries &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>Apache LDAP API</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Latest Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.5-deleting.html">2.5 - Deleting entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.7-moving-renaming.html">2.7 - Moving an renaming entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="26-modifying-entries-e">2.6 - Modifying entries (e)</h1>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.5-deleting.html">2.5 - Deleting entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.7-moving-renaming.html">2.7 - Moving an renaming entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/2.7-moving-renaming.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.7-moving-renaming.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/2.7-moving-renaming.html Tue Dec  4 16:24:46 2012
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>2.7 - Moving an renaming entries &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>Apache LDAP API</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Latest Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.6-modifying.html">2.6 - Modifying entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.8-comparing.html">2.8 - Comparing entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="27-moving-an-renaming-entries-e">2.7 - Moving an renaming entries (e)</h1>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.6-modifying.html">2.6 - Modifying entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.8-comparing.html">2.8 - Comparing entries</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/2.8-comparing.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.8-comparing.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/2.8-comparing.html Tue Dec  4 16:24:46 2012
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>2.8 - Comparing entries &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>Apache LDAP API</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Latest Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.7-moving-renaming.html">2.7 - Moving an renaming entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.9-exception-management.html">2.9 - Exception management</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="28-comparing-entries-e">2.8 - Comparing entries (e)</h1>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.7-moving-renaming.html">2.7 - Moving an renaming entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="2.9-exception-management.html">2.9 - Exception management</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file

Added: websites/staging/directory/trunk/content/api/user-guide/2.9-exception-management.html
==============================================================================
--- websites/staging/directory/trunk/content/api/user-guide/2.9-exception-management.html (added)
+++ websites/staging/directory/trunk/content/api/user-guide/2.9-exception-management.html Tue Dec  4 16:24:46 2012
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+	<head>
+		<title>2.9 - Exception management &mdash; Apache Directory</title>
+		
+	    <link href="./../../css/common.css" rel="stylesheet" type="text/css">
+	    <link href="./../../css/brown.css" rel="stylesheet" type="text/css">
+    
+	</head>
+	<body>
+	    <div id="container">
+            <div id="header">
+                <div id="subProjectsNavBar">
+                    <a href="./../../">
+                        
+                        Apache Directory Project
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../apacheds">
+                        
+                        ApacheDS
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../studio">
+                        
+                        Apache Directory Studio
+                        
+                    </a>
+                    &nbsp;|&nbsp;
+                    <a href="./../../api">
+                        
+                        <STRONG>Apache LDAP API</STRONG>
+                        
+                    </a>
+                </div><!-- subProjectsNavBar -->
+            </div><!-- header -->
+            <div id="content">
+                <div id="leftColumn">
+                    
+<div id="navigation">
+    
+    <h5>Latest Downloads</h5>
+    <ul>
+	    <li><a href="./../../api/downloads.html">Version 1.0.0-M13</a>&nbsp;&nbsp;<IMG src="./../../images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+    </ul>
+    <h5>Getting Started</h5>
+    <ul>
+        <li><a href="./../../api/vision.html">Vision</a></li>
+        <li><a href="./../../api/java-api.html">Java API</a></li>
+        <li><a href="./../../api/groovy-ldap.html">Groovy API</a></li>
+    </ul>
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="./../../api/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="./../../api/user-guide.html">User Guide</a></li>
+        <li><a href="./../../api/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <!--li><a href="./../../api/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="./../../api/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    
+    
+    <h5>Support</h5>
+    <ul>
+        <li><a href="./../../mailing-lists-and-irc.html">Mailing Lists &amp; IRC</a></li>
+        <li><a href="./../../sources.html">Sources</a></li>
+        <li><a href="./../../issue-tracking.html">Issue Tracking</a></li>
+        <li><a href="./../../commercial-support.html">Commercial Support</a></li>
+    </ul>
+    <h5>Community</h5>
+    <ul>
+        <li><a href="./../../contribute.html">How to Contribute</a></li>
+        <li><a href="./../../team.html">Team</a></li>
+        <li><a href="./../../original-project-proposal.html">Original Project Proposal</a></li>
+        <li><a href="./../../special-thanks.html" class="external-link" rel="nofollow">Special Thanks</a></li>
+    </ul>
+    <h5>About Apache</h5>
+    <ul>
+        <li><a href="http://www.apache.org/">Apache</a></li>
+        <li><a href="http://www.apache.org/licenses/">License</a></li>
+        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+        <li><a href="http://www.apache.org/security/">Security</a></li>
+    </ul>
+    
+</div><!-- navigation -->
+
+                </div><!-- leftColumn -->
+                <div id="rightColumn">
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.8-comparing.html">2.8 - Comparing entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="3-advanced-ldap-api-usage.html">3 - Advanced LDAP API Usage</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+<h1 id="29-exception-management">2.9 - Exception management (...)</h1>
+
+
+    <div class="nav">
+        <div class="nav_prev">
+        
+            <a href="2.8-comparing.html">2.8 - Comparing entries</a>
+		
+        </div>
+        <div class="nav_up">
+        
+            <a href="2-basic-ldap-api-usage.html">2 - Basic LDAP API usage</a>
+		
+        </div>
+        <div class="nav_next">
+        
+            <a href="3-advanced-ldap-api-usage.html">3 - Advanced LDAP API Usage</a>
+		
+        </div>
+        <div class="clearfix"></div>
+    </div>
+
+
+                </div><!-- rightColumn -->
+                <div id="endContent"></div>
+            </div><!-- content -->
+            <div id="footer">&copy; 2003-2012, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="./../../privacy-policy.html">Privacy Policy</a><br />
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+            </div>
+        </div><!-- container -->
+    </body>
+</html>
\ No newline at end of file



Mime
View raw message