external-software/github_OpenIdentityPlatform_OpenDJ.git

This removes old debug logging framework method calls that are going to be ...
boli
01.27.2007 4783adc14c2d6b96260052d3b634eafa500c6ddf
 opendj-sdk/opends/ext/aspectj/LICENSE-AspectJ.html

New file
@@ -0,0 +1,91 @@
<html>

<head>
<title>AspectJ License</title>


</head>

<BODY BGCOLOR="white">

<h2 align="center"><b>AspectJ<sup><small>TM</small></sup>
                      Compiler and Core Tools License</b></h2>

<p>This is a binary-only release.&nbsp; Source code
is available from
<a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a></p>

<p>The Eclipse Foundation makes available all content in this distribution ("Content").  
      Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
      Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
      at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
      For purposes of the EPL, "Program" will mean the Content.</p>

      <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
      being redistributed by another party ("Redistributor") and different terms and conditions may
      apply to your use of any object code in the Content.  Check the Redistributor's license 
      that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
      indicated below, the terms and conditions of the EPL still apply to any source code in the Content
      and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>

		
      <h3>Third Party Content</h3>
      <p>The Content includes items that have been sourced from third parties as set out below. If you 
      did not receive this Content directly from the Eclipse Foundation, the following is provided 
      for informational purposes only, and you should look to the Redistributor?s license for 
      terms and conditions of use.</p>
      <em>

      <h4>BCEL v5.1</h4>
      <p>This product contains software developed by the
         Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p>
 
      <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1.
      BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source
      code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code
      is made available under the Apache Software License v1.1</p>
		
      <h4>ASM v2.2.1</h4> 
      <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>)
      The source code for ASM is available from the ObjectWeb download site at 
      <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>. 
      <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>. 
      The license is also reproduced here:
      </p>

<pre>Copyright (c) 2000-2005 INRIA, France Telecom
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
   notice, this list of conditions and the following disclaimer in the
   documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holders nor the names of its
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
</pre>

</em>

</body>

</html>

 opendj-sdk/opends/ext/aspectj/README-AspectJ.html

New file
@@ -0,0 +1,346 @@
<html>

<head>
<meta http-equiv="Content-Language" content="en-us">
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
<title>AspectJ Readme</title>
<STYLE TYPE="text/css">
<!--

   /* FOR THE SDA PAGE */

   /*
   BODY {margin-top: 15px; margin-left: 15px; margin-right: 15px;}
   */

   A:link {
      color:#4756AC;
   }
   A:visited {
      color:#60657B;
   }
   A:hover {
      color:red
   }

   INPUT {font:12px "Courier New", sans-serif;}

   H2 {
      font:18px/18px Verdana, Arial, Helvetica, sans-serif;
      color:black;
      font-weight:bold;
      margin-left: 10px;
      line-height:110%;
   }
   H3 {
      font:18px/18px Verdana, Arial, Helvetica, sans-serif;
      color:black;
      font-weight:bold;
      margin-left: 10px;
      line-height:110%;
   }
   H4 {
      font:15px/16px Verdana, Arial, Helvetica, sans-serif;
      color:black;
      font-weight:bold;
      margin-left: 10px;
      line-height:140%;
   }
   P {
      font:13px/13px Verdana, Arial, Helvetica, sans-serif;
      margin-right: 10px;
      margin-left: 10px;
      line-height:130%;
   }
   .paragraph {
      font:13px/13px Verdana, Arial, Helvetica, sans-serif;
      margin-right: 10px;
      margin-left: 10px;
      line-height:130%;
   }
   .smallParagraph {
      font:11px/11px Verdana, Arial, Helvetica, sans-serif;
      margin-right: 10px;
      margin-left: 10px;
      line-height:130%;
   }
   /*
   LI {
      font:13px/13px Verdana, Arial, Helvetica, sans-serif;
      text-align:justify;
      margin-right: 10px;
      margin-left: 15px;
      line-height:120%;
   }

   UL {
      font:13px/13px Verdana, Arial, Helvetica, sans-serif;
      text-align:justify;
      margin-right: 10px;
      margin-left: 15px;
      line-height:120%;
   }*/

   DL {
      font:13px/13px Verdana, Arial, Helvetica, sans-serif;
      text-align:justify;
      margin-right: 10px;
      margin-left: 15px;
      line-height:120%;
   }
   B { font:13px/13px Verdana, Arial, Helvetica, sans-serif;
      font-weight:bold;
      line-height:140%;
   }
   .footer {
      font:10px/10px Verdana, Arial, Helvetica, sans-serif;
      color:#888888;
      text-align:left
   }
   .figureTitle {
      font:13px/13px Verdana, Arial, Helvetica, sans-serif;
      text-align:justify;
      text-align:center
   }
   .copyrightNotice {
      font:10px/10px Verdana, Arial, Helvetica, sans-serif;
      color:#999999;
      line-height:110%;
   }
   .smallHeading {
      font:13px/13px Verdana, Arial, Helvetica, sans-serif;
      font-weight:bold;
      line-height:110%;
   }
   .tinyHeading {
      font:11px/11px Verdana, Arial, Helvetica, sans-serif;
      font-weight:bold;
      line-height:120%;
   }
   .newsText {
      font:11px/11px Verdana, Arial, Helvetica, sans-serif;
      line-height:130%;
   }
   .smallParagraph {
      font:11px/11px Verdana, Arial, Helvetica, sans-serif;
      line-height:130%;
   }
   .fancyHeading {
      font:20px/20px Chantilly, Arial, Helvetica, sans-serif;
      margin-right: 10px;
      color:#6f7a92;
      margin-left: 10px;
      line-height:130%;
   }

-->
</STYLE>
</head>

<BODY BGCOLOR="white">

<h2 align="center">AspectJ<sup><small>TM</small></sup></h2>

<p align="center"><i>Version 1.5.3 released on Wednesday Nov 22, 2006.</i></p>

<h3>1 Contents of this Package</h3>

<UL>
  <li>the <a href="bin"><CODE>&lt;aspectj install dir&gt;/bin</CODE></a>
      directory has scripts for 
       <ul>
    <li><CODE>ajc</CODE>: the compiler for the AspectJ language</li>

     <!-- XXX removed references to ajdoc and ajdb -->
    <li><CODE>ajbrowser</CODE>: a graphical editor for 
    compiling programs with <CODE>ajc</CODE> 
    and navigating the crosscutting structure of those programs</li>
       </ul>

  <li>the directory <a href="lib"><CODE>&lt;aspectj install dir&gt;/lib</CODE></a>
      has the AspectJ binaries,
       <ul>
    <li><CODE><a href="lib/aspectjtools.jar">aspectjtools.jar</a></CODE>: libraries for 
    <code>ajc</code>, <code>ajbrowser</code>, and the Ant tasks</li>

    <li><CODE>aspectjrt.jar</CODE>: runtime library for AspectJ programs</li>
       </ul>
  </li>
  <li>the directory <a href="doc"><CODE>&lt;aspectj install dir&gt;/doc</CODE></a>
      has examples, programming and development environment guides,
      instructions for the Ant tasks, a README for 1.1 changes,
      and a quick reference, all linked
      from the <a href="doc/index.html">index</a> page.
  </li>
  <li>this <a href="README-AspectJ.html">README-AspectJ.html</a>, and
  </li>
  <li>the <a href="LICENSE-AspectJ.html">LICENSE-AspectJ.html</a>
      applying to this distribution.
  </li>
</UL>

<hr>

<h3>2 Install Procedure</h3>

<p>The AspectJ tools <code>ajc</code> and <code>ajbrowser</code> are
Java programs that can be run indirectly from the scripts or 
directly from <code>aspectjtools.jar</code>.  
The <code>aspectjrt.jar</code> needs to be on the classpath
when compiling or running programs compiled
by <code>ajc</code>.  This procedure shows ways to do that.
</p>

<p>After finishing automatic installation, we recommend that the
following steps to complete your installation:</p>

  <p><b>2.1 Add <CODE>&lt;aspectj install dir&gt;/lib/aspectjrt.jar</CODE> 
      to your class path</b></p>

<blockquote>
  <p>This small .jar file contains classes required to compile programs 
  with the ajc compiler, and to run programs compiled with the ajc
  compiler.  You must have these classes somewhere on your class path
  when running programs compiled with ajc.  For detailed instructions
  please see the <a href="#configInstructions">Configuration
  Instructions</a> at the bottom of this document.</p>
</blockquote>

  <p><b>2.2 Put the AspectJ <code>bin</code> directory on your PATH</b></p>

<blockquote>
  <p>Modify your PATH to include <code><b>&lt;aspectj install
  dir&gt;/bin</b></code>.  This will make it easier to run ajc.
  For detailed instructions please see the
  <a href="#configInstructions">Configuration Instructions</a> at the
  bottom of this document.</p>
</blockquote>

<p><b>2.3 Review the documentation and examples </b></p>

<blockquote>
  <p>Development and programming guides
  are available in <a href="doc/index.html">docs</a>,
  and example programs and an Ant script are available in
  <a href="doc/examples/">examples</a>.
</blockquote>

<p>If you did not use the automatic installation process, you may wish
to create short launch scripts to start ajc easily (section 3).</p>

<hr>

<h3>3. Running the Tools</h3>

<p>If you did not use the automatic installation process or the
default launch scripts do not work on your system, you may wish to
create short launch scripts to start ajc easily.  </p>

<p>You can also run the <code>aspectjtools.jar</code> directly
using java's -jar option:

<blockquote>
<CODE>C:\jdk1.3\bin\java.exe -jar D:\aspectj\lib\aspectjtools.jar %*</CODE>
</blockquote>

<p>With no arguments or only argument list (.lst) files, this will launch
<code>ajbrowser</code>, the GUI structure browser; otherwise, it will
run <code>ajc</code>, the AspectJ compiler.  This means that 
if your browser is set up to run jar files, clicking a link
to <a href="lib/aspectjtools.jar">lib/aspectjtools.jar</a> will 
launch <code>ajbrowser</code>.

<p> You can also create scripts like those created by the installer.
These scripts use full paths that are system dependent so you will
likely have to change these. </p>

<p>Here's a sample launch script for WinNT and Win2K (note that this
is single line in the .bat file):</p>

<blockquote>
<CODE>C:\jdk1.3\bin\java.exe -classpath D:\aspectj\lib\aspectjtools.jar -Xmx64M
org.aspectj.tools.ajc.Main %*</CODE>
</blockquote>

<p>Here's a sample launch script for a Unix shell (on Linux using Sun's JDK1.3):</p>

<blockquote>
<CODE>/usr/java/jdk1.3/jre/bin/java -classpath /home/aspectj/lib/aspectjtools.jar -Xmx64M org.aspectj.tools.ajc.Main "$@"</CODE>
</blockquote>

<hr>
<h3><a name="configInstructions">4. Configuration Instructions</a></h3>

<h4>4.1 Adding <code>&lt;aspectj install dir&gt;/lib/aspectjrt.jar</code> to your classpath</h4>

<p>There are several ways to add this jar file to your classpath:</p>

<ul>
    <li>
      copy <code>aspectjrt.jar</code> to the <code>jdk/jre/lib/ext</code> directory</li>
    <li>
      add <code>aspectjrt.jar</code> to your CLASSPATH
      environment variable (see the next section for details)</li>
    <li>
      always use the "<code>-classpath aspectjrt.jar</code>" option when running
      programs compiled with ajc</li>
</ul>
<h4>4.2 <A NAME="6.1">Setting the Environment Variables on Windows</A></h4>

<P>The following instructions use the PATH variable as an example, but
this process is identical for the CLASSPATH variable.  </P>

<P>You can do the variables permanently for all the shells that you
will run or temporarily only for the current shell.  To change the
PATH only in the current shell, and assuming you've installed AspectJ
in <code>C:\apps\aspectj</code>, type:</P>

<blockquote><code>&gt; set PATH=%PATH%;C:\apps\aspectj\bin</code></blockquote>

<P><b>Changing Environment Variables Permanently on WinNT and Win2000</b>
<ul>
  <li>
    <p class="paragraph">open the Environment Variables dialog
    <ul>
      <li>
        <p class="paragraph">WinNT: in "Control Panels" double-click
        "System" and select the "Environment" tab</li>
      <li>
        <p class="paragraph">Win2K: in "Control Panels" double-click
        "System", select the "Advanced" tab and click the
        "Environment Variables..." button</li>
    </ul>
  </li>
  <li>
    <p class="paragraph">select the environment variable for editing, or add it
    using the "New..." button if it does not exist</li>
  <li>
    <p class="paragraph">add the new entry separated from the others by a
    semi-colon (;) and close the dialog</li>
  <li>
    <p class="paragraph">note that the change will not affect shells that were
    already running </li>
</ul>
<P><b>Changing Environment Variables Permanently on Win9x</b>
<ul>
  <li>
    <p class="paragraph">open the AUTOEXEC.BAT with an editor such as NotePad</li>

<LI>
  <p class="paragraph">edit the PATH statement to include the new entry and save
  the file, e.g.<BR>

<blockquote>
  <CODE>PATH C:\WINDOWS;C:\WINDOWS\COMMAND;C:\;C:\DOS;C:\apps\aspectj\bin</CODE>
  </blockquote>
</LI>
<LI>
  <p class="paragraph">note that the change will not affect shells that were
  already running
</ul>

</body>

</html>

 opendj-sdk/opends/ext/aspectj/bin/aj

New file
@@ -0,0 +1,10 @@
#!/bin/sh
# This file generated by AspectJ installer
# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526

if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
fi
if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
fi

"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjweaver.jar" "-Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader" "-Daj.class.path=$ASPECTPATH:$CLASSPATH" "-Daj.aspect.path=$ASPECTPATH" "$@"

 opendj-sdk/opends/ext/aspectj/bin/aj5

New file
@@ -0,0 +1,10 @@
#!/bin/sh
# This file generated by AspectJ installer
# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526

if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
fi
if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
fi

"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjweaver.jar:$CLASSPATH" "-javaagent:$ASPECTJ_HOME/lib/aspectjweaver.jar" "$@"

 opendj-sdk/opends/ext/aspectj/bin/ajbrowser

New file
@@ -0,0 +1,10 @@
#!/bin/sh
# This file generated by AspectJ installer
# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526

if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
fi
if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
fi

"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjtools.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH" -Xmx64M org.aspectj.tools.ajbrowser.Main "$@"

 opendj-sdk/opends/ext/aspectj/bin/ajc

New file
@@ -0,0 +1,10 @@
#!/bin/sh
# This file generated by AspectJ installer
# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526

if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
fi
if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
fi

"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjtools.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH" -Xmx64M org.aspectj.tools.ajc.Main "$@"

 opendj-sdk/opends/ext/aspectj/bin/ajdoc

New file
@@ -0,0 +1,10 @@
#!/bin/sh
# This file generated by AspectJ installer
# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526

if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
fi
if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
fi

"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjtools.jar:$JAVA_HOME/lib/tools.jar:$CLASSPATH" -Xmx64M org.aspectj.tools.ajdoc.Main "$@"

 opendj-sdk/opends/ext/aspectj/lib/aspectjlib.jar

Binary files differ

 opendj-sdk/opends/ext/aspectj/lib/aspectjrt.jar

Binary files differ

 opendj-sdk/opends/ext/aspectj/lib/aspectjtools.jar

Binary files differ

 opendj-sdk/opends/ext/aspectj/lib/aspectjweaver.jar

Binary files differ

 opendj-sdk/opends/lib/aspectjrt.jar

Binary files differ

 opendj-sdk/opends/resource/config/config.ldif

@@ -1,69 +1,44 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License, Version 1.0 only
# (the "License").  You may not use this file except in compliance
# with the License.
#
# You can obtain a copy of the license at
# trunk/opends/resource/legal-notices/OpenDS.LICENSE
# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying * information:
#      Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
#      Portions Copyright 2006-2007 Sun Microsystems, Inc.
#
#
# This file contains the primary Directory Server configuration.  It must not
# be directly edited while the server is online.  The server configuration
# should only be managed using the administration utilities provided with the
# Directory Server.

dn: cn=config
objectClass: top
objectClass: ds-cfg-root-config
cn: config
ds-cfg-check-schema: true
ds-cfg-add-missing-rdn-attributes: true
ds-cfg-allow-attribute-name-exceptions: false
ds-cfg-invalid-attribute-syntax-behavior: reject
ds-cfg-single-structural-objectclass-behavior: reject
ds-cfg-notify-abandoned-operations: false
ds-cfg-proxied-authorization-identity-mapper-dn: cn=Exact Match,cn=Identity Mappers,cn=config
ds-cfg-size-limit: 1000
ds-cfg-time-limit: 60 seconds
ds-cfg-lookthrough-limit: 5000
ds-cfg-writability-mode: enabled
ds-cfg-bind-with-dn-requires-password: true
ds-cfg-reject-unauthenticated-requests: false
ds-cfg-single-structural-objectclass-behavior: reject
ds-cfg-check-schema: true
ds-cfg-allow-attribute-name-exceptions: false
ds-cfg-default-password-policy: cn=Default Password Policy,cn=Password Policies,cn=config
ds-cfg-proxied-authorization-identity-mapper-dn: cn=Exact Match,cn=Identity Mappers,cn=config
ds-cfg-lookthrough-limit: 5000
ds-cfg-time-limit: 60 seconds
ds-cfg-writability-mode: enabled
ds-cfg-add-missing-rdn-attributes: true
ds-cfg-notify-abandoned-operations: true
ds-cfg-reject-unauthenticated-requests: false
cn: config
ds-cfg-size-limit: 1000
modifiersName: cn=Privileged User,o=test
modifyTimestamp: 20070301011016Z

dn: cn=Access Control Handler,cn=config
objectClass: top
objectClass: ds-cfg-access-control-handler
cn: Access Control Handler
ds-cfg-acl-handler-class: org.opends.server.authorization.dseecompat.AciProvider
objectClass: top
ds-cfg-acl-handler-enabled: false
ds-cfg-acl-handler-class: org.opends.server.authorization.dseecompat.AciProvider
cn: Access Control Handler

dn: cn=Account Status Notification Handlers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Account Status Notification Handlers

dn: cn=Error Log Handler,cn=Account Status Notification Handlers,cn=config
objectClass: top
objectClass: ds-cfg-account-status-notification-handler
objectClass: top
objectClass: ds-cfg-error-log-account-status-notification-handler
cn: Error Log Handler
ds-cfg-account-status-notification-handler-class: org.opends.server.extensions.ErrorLogAccountStatusNotificationHandler
ds-cfg-account-status-notification-handler-enabled: true
ds-cfg-account-status-notification-type: account-temporarily-locked
@@ -78,1036 +53,1371 @@
ds-cfg-account-status-notification-type: password-expiring
ds-cfg-account-status-notification-type: password-reset
ds-cfg-account-status-notification-type: password-changed
cn: Error Log Handler

dn: cn=Alert Handlers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Alert Handlers

dn: cn=JMX Alert Handler,cn=Alert Handlers,cn=config
objectClass: top
objectClass: ds-cfg-alert-handler
ds-cfg-alert-handler-enabled: true
cn: JMX Alert Handler
ds-cfg-alert-handler-class: org.opends.server.extensions.JMXAlertHandler
ds-cfg-alert-handler-enabled: true

dn: cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Backends

dn: ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-je-backend
ds-cfg-backend-enabled: true
ds-cfg-backend-class: org.opends.server.backends.jeb.BackendImpl
ds-cfg-backend-id: userRoot
ds-cfg-backend-writability-mode: enabled
ds-cfg-backend-base-dn: dc=example,dc=com
ds-cfg-backend-directory: db
ds-cfg-backend-mode: 700
ds-cfg-backend-index-entry-limit: 4000
ds-cfg-backend-subtree-delete-size-limit: 100000
ds-cfg-backend-preload-time-limit: 0 seconds
ds-cfg-backend-import-temp-directory: importTmp
ds-cfg-backend-import-buffer-size: 256 megabytes
ds-cfg-backend-import-queue-size: 100
ds-cfg-backend-import-pass-size: 0
ds-cfg-backend-import-thread-count: 8
ds-cfg-backend-entries-compressed: false
ds-cfg-backend-deadlock-retry-limit: 10

dn: cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-branch
cn: Index

dn: ds-cfg-index-attribute=aci,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: aci
ds-cfg-index-type: presence

dn: ds-cfg-index-attribute=cn,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: cn
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring

dn: ds-cfg-index-attribute=givenName,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: givenName
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring

dn: ds-cfg-index-attribute=mail,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: mail
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring

dn: ds-cfg-index-attribute=member,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: member
ds-cfg-index-type: equality

dn: ds-cfg-index-attribute=objectClass,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: objectClass
ds-cfg-index-type: equality

dn: ds-cfg-index-attribute=sn,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: sn
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring

dn: ds-cfg-index-attribute=telephoneNumber,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: telephoneNumber
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring

dn: ds-cfg-index-attribute=uid,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: uid
ds-cfg-index-type: equality

dn: ds-cfg-index-attribute=ds-sync-hist,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: ds-sync-hist
ds-cfg-index-type: ordering

dn: ds-cfg-index-attribute=entryuuid,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-attribute: entryuuid
ds-cfg-index-type: equality

dn: cn=JE Database,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-database
cn: JE Database
ds-cfg-database-cache-percent: 10
ds-cfg-database-cache-size: 0 megabytes
ds-cfg-database-txn-no-sync: false
ds-cfg-database-txn-write-no-sync: true
ds-cfg-database-run-cleaner: true
ds-cfg-database-cleaner-num-threads: 1
ds-cfg-database-cleaner-min-utilization: 75
ds-cfg-database-evictor-lru-only: true
ds-cfg-database-evictor-nodes-per-scan: 10
ds-cfg-database-log-file-max: 50 megabytes
ds-cfg-database-logging-file-handler-on: true
ds-cfg-database-logging-level: CONFIG
ds-cfg-database-checkpointer-bytes-interval: 20 megabytes
ds-cfg-database-checkpointer-wakeup-interval: 30 seconds
ds-cfg-database-lock-num-lock-tables: 19

dn: ds-cfg-backend-id=backup,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-backup-backend
ds-cfg-backend-enabled: true
ds-cfg-backend-class: org.opends.server.backends.BackupBackend
ds-cfg-backend-id: backup
ds-cfg-backend-writability-mode: disabled
objectClass: ds-cfg-backend
ds-cfg-backend-base-dn: cn=backups
ds-cfg-backend-id: backup
ds-cfg-backup-directory: bak
ds-cfg-backend-writability-mode: disabled
ds-cfg-backend-class: org.opends.server.backends.BackupBackend
ds-cfg-backend-enabled: true

dn: ds-cfg-backend-id=config,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
ds-cfg-backend-enabled: true
ds-cfg-backend-class: org.opends.server.extensions.ConfigFileHandler
ds-cfg-backend-base-dn: cn=config
ds-cfg-backend-id: config
ds-cfg-backend-writability-mode: enabled
ds-cfg-backend-base-dn: cn=config
ds-cfg-backend-class: org.opends.server.extensions.ConfigFileHandler
ds-cfg-backend-enabled: true

dn: ds-cfg-backend-id=monitor,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
ds-cfg-backend-enabled: true
ds-cfg-backend-class: org.opends.server.backends.MonitorBackend
ds-cfg-backend-base-dn: cn=monitor
ds-cfg-backend-id: monitor
ds-cfg-backend-writability-mode: disabled
ds-cfg-backend-base-dn: cn=monitor
ds-cfg-backend-class: org.opends.server.backends.MonitorBackend
ds-cfg-backend-enabled: true

dn: ds-cfg-backend-id=schema,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-schema-backend
ds-cfg-backend-enabled: true
ds-cfg-backend-class: org.opends.server.backends.SchemaBackend
ds-cfg-backend-id: schema
ds-cfg-backend-writability-mode: enabled
objectClass: ds-cfg-backend
ds-cfg-backend-base-dn: cn=schema
ds-cfg-backend-id: schema
ds-cfg-show-all-attributes: false
ds-cfg-backend-writability-mode: enabled
ds-cfg-backend-class: org.opends.server.backends.SchemaBackend
ds-cfg-backend-enabled: true

dn: ds-cfg-backend-id=tasks,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-backend
objectClass: ds-cfg-task-backend
ds-cfg-backend-enabled: true
ds-cfg-backend-class: org.opends.server.backends.task.TaskBackend
ds-cfg-backend-id: tasks
ds-cfg-backend-writability-mode: enabled
ds-cfg-backend-base-dn: cn=tasks
ds-cfg-task-backing-file: config/tasks.ldif
ds-cfg-backend-id: tasks
ds-cfg-task-retention-time: 24 hours
ds-cfg-task-backing-file: config/tasks.ldif
ds-cfg-backend-writability-mode: enabled
ds-cfg-backend-class: org.opends.server.backends.task.TaskBackend
ds-cfg-backend-enabled: true

dn: ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: ds-cfg-je-backend
objectClass: top
objectClass: ds-cfg-backend
ds-cfg-backend-import-buffer-size: 256 megabytes
ds-cfg-backend-deadlock-retry-limit: 10
ds-cfg-backend-base-dn: dc=example,dc=com
ds-cfg-backend-id: userRoot
ds-cfg-backend-import-queue-size: 100
ds-cfg-backend-index-entry-limit: 4000
ds-cfg-backend-writability-mode: enabled
ds-cfg-backend-class: org.opends.server.backends.jeb.BackendImpl
ds-cfg-backend-subtree-delete-size-limit: 100000
ds-cfg-backend-directory: db
ds-cfg-backend-import-thread-count: 8
ds-cfg-backend-preload-time-limit: 0 seconds
ds-cfg-backend-import-pass-size: 0
ds-cfg-backend-entries-compressed: false
ds-cfg-backend-mode: 700
ds-cfg-backend-enabled: TRUE
ds-cfg-backend-import-temp-directory: importTmp
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301011024Z

dn: cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: ds-cfg-branch
objectClass: top
cn: Index

dn: ds-cfg-index-attribute=aci,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-attribute: aci

dn: ds-cfg-index-attribute=cn,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: cn

dn: ds-cfg-index-attribute=ds-sync-hist,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: ordering
ds-cfg-index-attribute: ds-sync-hist

dn: ds-cfg-index-attribute=entryuuid,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: equality
ds-cfg-index-attribute: entryuuid

dn: ds-cfg-index-attribute=givenName,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: givenName

dn: ds-cfg-index-attribute=mail,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: mail

dn: ds-cfg-index-attribute=member,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: equality
ds-cfg-index-attribute: member

dn: ds-cfg-index-attribute=objectClass,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: equality
ds-cfg-index-attribute: objectClass

dn: ds-cfg-index-attribute=sn,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: sn

dn: ds-cfg-index-attribute=telephoneNumber,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: telephoneNumber

dn: ds-cfg-index-attribute=uid,cn=Index,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: equality
ds-cfg-index-attribute: uid

dn: cn=JE Database,ds-cfg-backend-id=userRoot,cn=Backends,cn=config
objectClass: ds-cfg-je-database
objectClass: top
ds-cfg-database-lock-num-lock-tables: 19
ds-cfg-database-evictor-nodes-per-scan: 10
ds-cfg-database-logging-file-handler-on: true
ds-cfg-database-evictor-lru-only: true
ds-cfg-database-cache-percent: 10
ds-cfg-database-run-cleaner: true
ds-cfg-database-cleaner-min-utilization: 75
ds-cfg-database-checkpointer-wakeup-interval: 30 seconds
ds-cfg-database-cache-size: 0 megabytes
ds-cfg-database-checkpointer-bytes-interval: 20 megabytes
ds-cfg-database-log-file-max: 50 megabytes
ds-cfg-database-cleaner-num-threads: 1
ds-cfg-database-logging-level: CONFIG
cn: JE Database
ds-cfg-database-txn-no-sync: false
ds-cfg-database-txn-write-no-sync: true

dn: ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: ds-cfg-je-backend
objectClass: top
objectClass: ds-cfg-backend
ds-cfg-backend-import-buffer-size: 256 megabytes
ds-cfg-backend-deadlock-retry-limit: 10
ds-cfg-backend-base-dn: dc=verify, dc=jeb
ds-cfg-backend-id: verifyRoot
ds-cfg-backend-import-queue-size: 100
ds-cfg-backend-index-entry-limit: 10
ds-cfg-backend-writability-mode: enabled
ds-cfg-backend-class: org.opends.server.backends.jeb.BackendImpl
ds-cfg-backend-subtree-delete-size-limit: 100000
ds-cfg-backend-directory: db_verify
ds-cfg-backend-import-thread-count: 8
ds-cfg-backend-preload-time-limit: 0 seconds
ds-cfg-backend-import-pass-size: 0
ds-cfg-backend-entries-compressed: false
ds-cfg-backend-mode: 700
ds-cfg-backend-enabled: TRUE
ds-cfg-backend-import-temp-directory: importTmp
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010722Z

dn: cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: ds-cfg-branch
objectClass: top
cn: Index

dn: ds-cfg-index-attribute=cn,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: cn

dn: ds-cfg-index-attribute=ds-sync-hist,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: ordering
ds-cfg-index-attribute: ds-sync-hist

dn: ds-cfg-index-attribute=entryuuid,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: equality
ds-cfg-index-attribute: entryuuid

dn: ds-cfg-index-attribute=givenName,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: givenName

dn: ds-cfg-index-attribute=mail,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-type: ordering
ds-cfg-index-attribute: mail

dn: ds-cfg-index-attribute=member,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: equality
ds-cfg-index-attribute: member

dn: ds-cfg-index-attribute=sn,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: sn

dn: ds-cfg-index-attribute=telephoneNumber,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: presence
ds-cfg-index-type: equality
ds-cfg-index-type: substring
ds-cfg-index-attribute: telephoneNumber

dn: ds-cfg-index-attribute=uid,cn=Index,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: top
objectClass: ds-cfg-je-index
ds-cfg-index-type: equality
ds-cfg-index-attribute: uid

dn: cn=JE Database,ds-cfg-backend-id=verifyRoot,cn=Backends,cn=config
objectClass: ds-cfg-je-database
objectClass: top
ds-cfg-database-lock-num-lock-tables: 19
ds-cfg-database-evictor-nodes-per-scan: 10
ds-cfg-database-logging-file-handler-on: true
ds-cfg-database-evictor-lru-only: true
ds-cfg-database-cache-percent: 10
ds-cfg-database-run-cleaner: true
ds-cfg-database-cleaner-min-utilization: 75
ds-cfg-database-checkpointer-wakeup-interval: 30 seconds
ds-cfg-database-cache-size: 0 megabytes
ds-cfg-database-checkpointer-bytes-interval: 20 megabytes
ds-cfg-database-log-file-max: 50 megabytes
ds-cfg-database-cleaner-num-threads: 1
ds-cfg-database-logging-level: CONFIG
cn: JE Database
ds-cfg-database-txn-no-sync: false
ds-cfg-database-txn-write-no-sync: true

dn: cn=Certificate Mappers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Certificate Mappers

dn: cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config
objectClass: ds-cfg-fingerprint-certificate-mapper
objectClass: top
objectClass: ds-cfg-certificate-mapper
ds-cfg-certificate-mapper-class: org.opends.server.extensions.FingerprintCertificateMapper
ds-cfg-certificate-mapper-enabled: true
ds-cfg-certificate-fingerprint-attribute-type: ds-certificate-fingerprint
cn: Fingerprint Mapper
ds-cfg-certificate-fingerprint-algorithm: MD5
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010843Z

dn: cn=Subject Attribute to User Attribute,cn=Certificate Mappers,cn=config
objectClass: top
objectClass: ds-cfg-subject-attribute-to-user-attribute-certificate-mapper
objectClass: ds-cfg-certificate-mapper
ds-cfg-certificate-mapper-enabled: true
ds-cfg-certificate-mapper-class: org.opends.server.extensions.SubjectAttributeToUserAttributeCertificateMapper
ds-cfg-certificate-subject-attribute-mapping: cn:cn
ds-cfg-certificate-subject-attribute-mapping: e:mail
cn: Subject Attribute to User Attribute
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010846Z

dn: cn=Subject DN to User Attribute,cn=Certificate Mappers,cn=config
objectClass: ds-cfg-subject-dn-to-user-attribute-certificate-mapper
objectClass: top
objectClass: ds-cfg-certificate-mapper
ds-cfg-certificate-mapper-enabled: true
ds-cfg-certificate-mapper-class: org.opends.server.extensions.SubjectDNToUserAttributeCertificateMapper
cn: Subject DN to User Attribute
ds-cfg-certificate-subject-attribute-type: ds-certificate-subject-dn
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010846Z

dn: cn=Subject Equals DN,cn=Certificate Mappers,cn=config
objectClass: top
objectClass: ds-cfg-certificate-mapper
cn: Subject Equals DN
ds-cfg-certificate-mapper-class: org.opends.server.extensions.SubjectEqualsDNCertificateMapper
ds-cfg-certificate-mapper-enabled: true

dn: cn=Subject DN to User Attribute,cn=Certificate Mappers,cn=config
objectClass: top
objectClass: ds-cfg-certificate-mapper
objectClass: ds-cfg-subject-dn-to-user-attribute-certificate-mapper
cn: Subject DN to User Attribute
ds-cfg-certificate-mapper-class: org.opends.server.extensions.SubjectDNToUserAttributeCertificateMapper
ds-cfg-certificate-mapper-enabled: true
ds-cfg-certificate-subject-attribute-type: ds-certificate-subject-dn

dn: cn=Subject Attribute to User Attribute,cn=Certificate Mappers,cn=config
objectClass: top
objectClass: ds-cfg-certificate-mapper
objectClass: ds-cfg-subject-attribute-to-user-attribute-certificate-mapper
cn: Subject Attribute to User Attribute
ds-cfg-certificate-mapper-class: org.opends.server.extensions.SubjectAttributeToUserAttributeCertificateMapper
ds-cfg-certificate-mapper-enabled: true
ds-cfg-certificate-subject-attribute-mapping: cn:cn
ds-cfg-certificate-subject-attribute-mapping: e:mail

dn: cn=Fingerprint Mapper,cn=Certificate Mappers,cn=config
objectClass: top
objectClass: ds-cfg-certificate-mapper
objectClass: ds-cfg-fingerprint-certificate-mapper
cn: Fingerprint Mapper
ds-cfg-certificate-mapper-class: org.opends.server.extensions.FingerprintCertificateMapper
ds-cfg-certificate-mapper-enabled: true
ds-cfg-certificate-fingerprint-attribute-type: ds-certificate-fingerprint
ds-cfg-certificate-fingerprint-algorithm: MD5
cn: Subject Equals DN

dn: cn=Connection Handlers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Connection Handlers

dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config
objectClass: top
objectClass: ds-cfg-connection-handler
objectClass: ds-cfg-ldap-connection-handler
cn: LDAP Connection Handler
ds-cfg-connection-handler-class: org.opends.server.protocols.ldap.LDAPConnectionHandler
ds-cfg-connection-handler-enabled: true
ds-cfg-listen-address: 0.0.0.0
ds-cfg-listen-port: 389
ds-cfg-accept-backlog: 128
ds-cfg-allow-ldapv2: true
ds-cfg-keep-stats: true
ds-cfg-use-tcp-keepalive: true
ds-cfg-use-tcp-nodelay: true
ds-cfg-allow-tcp-reuse-address: true
ds-cfg-send-rejection-notice: true
ds-cfg-max-request-size: 5 megabytes
ds-cfg-num-request-handlers: 2
ds-cfg-allow-start-tls: false
ds-cfg-use-ssl: false
ds-cfg-ssl-client-auth-policy: optional
ds-cfg-ssl-cert-nickname: server-cert

dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
objectClass: top
objectClass: ds-cfg-connection-handler
objectClass: ds-cfg-ldap-connection-handler
cn: LDAPS Connection Handler
ds-cfg-connection-handler-class: org.opends.server.protocols.ldap.LDAPConnectionHandler
ds-cfg-connection-handler-enabled: false
ds-cfg-listen-address: 0.0.0.0
ds-cfg-listen-port: 636
ds-cfg-accept-backlog: 128
ds-cfg-allow-ldapv2: true
ds-cfg-keep-stats: true
ds-cfg-use-tcp-keepalive: true
ds-cfg-use-tcp-nodelay: true
ds-cfg-allow-tcp-reuse-address: true
ds-cfg-send-rejection-notice: true
ds-cfg-max-request-size: 5 megabytes
ds-cfg-num-request-handlers: 2
ds-cfg-allow-start-tls: false
ds-cfg-use-ssl: true
ds-cfg-ssl-client-auth-policy: optional
ds-cfg-ssl-cert-nickname: server-cert
ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config
ds-cfg-trust-manager-provider-dn: cn=JKS,cn=Trust Manager Providers,cn=config

dn: cn=JMX Connection Handler,cn=Connection Handlers,cn=config
objectClass: top
objectClass: ds-cfg-connection-handler
objectClass: ds-cfg-jmx-connection-handler
cn: JMX Connection Handler
ds-cfg-connection-handler-class: org.opends.server.protocols.jmx.JmxConnectionHandler
ds-cfg-connection-handler-enabled: true
ds-cfg-use-ssl: false
ds-cfg-listen-port: 1689
ds-cfg-listen-port: 47147
ds-cfg-ssl-cert-nickname: server-cert
ds-cfg-connection-handler-class: org.opends.server.protocols.jmx.JmxConnectionHandler
cn: JMX Connection Handler
ds-cfg-use-ssl: false
ds-cfg-connection-handler-enabled: true

dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config
objectClass: top
objectClass: ds-cfg-connection-handler
objectClass: ds-cfg-ldap-connection-handler
ds-cfg-trust-manager-provider-dn: cn=JKS,cn=Trust Manager Providers,cn=config
ds-cfg-use-tcp-nodelay: true
ds-cfg-use-tcp-keepalive: true
ds-cfg-ssl-client-auth-policy: optional
ds-cfg-allow-tcp-reuse-address: true
ds-cfg-use-ssl: false
ds-cfg-keep-stats: true
ds-cfg-listen-port: 47146
ds-cfg-send-rejection-notice: true
ds-cfg-allow-start-tls: true
ds-cfg-ssl-cert-nickname: server-cert
ds-cfg-connection-handler-class: org.opends.server.protocols.ldap.LDAPConnectionHandler
ds-cfg-allow-ldapv2: true
ds-cfg-accept-backlog: 128
cn: LDAP Connection Handler
ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config
ds-cfg-num-request-handlers: 2
ds-cfg-listen-address: 0.0.0.0
ds-cfg-connection-handler-enabled: true
ds-cfg-max-request-size: 5 megabytes

dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
objectClass: top
objectClass: ds-cfg-connection-handler
objectClass: ds-cfg-ldap-connection-handler
ds-cfg-trust-manager-provider-dn: cn=JKS,cn=Trust Manager Providers,cn=config
ds-cfg-use-tcp-nodelay: true
ds-cfg-use-tcp-keepalive: true
ds-cfg-ssl-client-auth-policy: optional
ds-cfg-allow-tcp-reuse-address: true
ds-cfg-use-ssl: true
ds-cfg-keep-stats: true
ds-cfg-listen-port: 47148
ds-cfg-send-rejection-notice: true
ds-cfg-allow-start-tls: false
ds-cfg-ssl-cert-nickname: server-cert
ds-cfg-connection-handler-class: org.opends.server.protocols.ldap.LDAPConnectionHandler
ds-cfg-allow-ldapv2: true
ds-cfg-accept-backlog: 128
cn: LDAPS Connection Handler
ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config
ds-cfg-num-request-handlers: 2
ds-cfg-listen-address: 0.0.0.0
ds-cfg-connection-handler-enabled: true
ds-cfg-max-request-size: 5 megabytes

dn: cn=Entry Cache,cn=config
objectClass: top
objectClass: ds-cfg-entry-cache
objectClass: ds-cfg-soft-reference-entry-cache
cn: Entry Cache
objectClass: ds-cfg-entry-cache
objectClass: top
ds-cfg-entry-cache-class: org.opends.server.extensions.SoftReferenceEntryCache
ds-cfg-entry-cache-enabled: false
cn: Entry Cache

dn: cn=Extended Operations,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Extended Operations

dn: cn=Cancel,cn=Extended Operations,cn=config
objectClass: top
objectClass: ds-cfg-extended-operation-handler
cn: Cancel
ds-cfg-extended-operation-handler-class: org.opends.server.extensions.CancelExtendedOperation
ds-cfg-extended-operation-handler-enabled: true
cn: Cancel

dn: cn=Password Modify,cn=Extended Operations,cn=config
objectClass: top
objectClass: ds-cfg-extended-operation-handler
objectClass: ds-cfg-password-modify-extended-operation-handler
cn: Password Modify
ds-cfg-extended-operation-handler-class: org.opends.server.extensions.PasswordModifyExtendedOperation
ds-cfg-extended-operation-handler-enabled: true
cn: Password Modify
ds-cfg-identity-mapper-dn: cn=Exact Match,cn=Identity Mappers,cn=config

dn: cn=StartTLS,cn=Extended Operations,cn=config
objectClass: top
objectClass: ds-cfg-extended-operation-handler
cn: StartTLS
ds-cfg-extended-operation-handler-class: org.opends.server.extensions.StartTLSExtendedOperation
ds-cfg-extended-operation-handler-enabled: true
cn: StartTLS

dn: cn=Who Am I,cn=Extended Operations,cn=config
objectClass: top
objectClass: ds-cfg-extended-operation-handler
cn: Who Am I
ds-cfg-extended-operation-handler-class: org.opends.server.extensions.WhoAmIExtendedOperation
ds-cfg-extended-operation-handler-enabled: true
cn: Who Am I

dn: cn=Group Implementations,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Group Implementations

dn: cn=Static,cn=Group Implementations,cn=config
objectClass: top
objectClass: ds-cfg-group-implementation
cn: Static
ds-cfg-group-implementation-class: org.opends.server.extensions.StaticGroup
ds-cfg-group-implementation-enabled: true
ds-cfg-group-implementation-class: org.opends.server.extensions.StaticGroup
cn: Static

dn: cn=Identity Mappers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Identity Mappers

dn: cn=Exact Match,cn=Identity Mappers,cn=config
objectClass: ds-cfg-exact-match-identity-mapper
objectClass: top
objectClass: ds-cfg-identity-mapper
objectClass: ds-cfg-exact-match-identity-mapper
cn: Exact Match
ds-cfg-identity-mapper-class: org.opends.server.extensions.ExactMatchIdentityMapper
ds-cfg-identity-mapper-enabled: true
cn: Exact Match
ds-cfg-match-attribute: uid
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010843Z

dn: cn=Key Manager Providers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Key Manager Providers

dn: cn=JKS,cn=Key Manager Providers,cn=config
objectClass: top
objectClass: ds-cfg-key-manager-provider
objectClass: top
objectClass: ds-cfg-file-based-key-manager-provider
cn: JKS
ds-cfg-key-manager-provider-class: org.opends.server.extensions.FileBasedKeyManagerProvider
ds-cfg-key-manager-provider-enabled: false
ds-cfg-key-store-type: JKS
ds-cfg-key-store-file: config/keystore
ds-cfg-key-store-pin-file: config/keystore.pin

dn: cn=PKCS12,cn=Key Manager Providers,cn=config
objectClass: top
objectClass: ds-cfg-key-manager-provider
objectClass: ds-cfg-file-based-key-manager-provider
cn: PKCS12
ds-cfg-key-manager-provider-class: org.opends.server.extensions.FileBasedKeyManagerProvider
ds-cfg-key-manager-provider-enabled: false
ds-cfg-key-store-type: PKCS12
ds-cfg-key-store-file: config/keystore.p12
ds-cfg-key-store-pin-file: config/keystore.pin
ds-cfg-key-store-pin: password
cn: JKS
ds-cfg-key-store-file: config/server.keystore
ds-cfg-key-manager-provider-enabled: true

dn: cn=PKCS11,cn=Key Manager Providers,cn=config
objectClass: top
objectClass: ds-cfg-key-manager-provider
objectClass: top
objectClass: ds-cfg-pkcs11-key-manager-provider
cn: PKCS11
ds-cfg-key-manager-provider-class: org.opends.server.extensions.PKCS11KeyManagerProvider
ds-cfg-key-manager-provider-enabled: false
ds-cfg-key-store-pin-file: config/keystore.pin
cn: PKCS11
ds-cfg-key-manager-provider-enabled: false

dn: cn=PKCS12,cn=Key Manager Providers,cn=config
objectClass: ds-cfg-key-manager-provider
objectClass: top
objectClass: ds-cfg-file-based-key-manager-provider
ds-cfg-key-store-type: PKCS12
ds-cfg-key-manager-provider-class: org.opends.server.extensions.FileBasedKeyManagerProvider
ds-cfg-key-store-pin: password
cn: PKCS12
ds-cfg-key-store-file: config/server-cert.p12
ds-cfg-key-manager-provider-enabled: true

dn: cn=Loggers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Loggers

dn: cn=File-Based Access Logger,cn=Loggers,cn=config
objectClass: top
objectClass: ds-cfg-logger
objectClass: ds-cfg-access-logger
objectClass: ds-cfg-file-based-access-logger
cn: File-Based Access Logger
ds-cfg-logger-class: org.opends.server.loggers.DirectoryAccessLogger
ds-cfg-logger-enabled: true
ds-cfg-log-file: logs/access
ds-cfg-suppress-internal-operations: true
objectClass: ds-cfg-logger
objectClass: top
objectClass: ds-cfg-access-logger
ds-cfg-rotation-policy: Size
ds-cfg-rotation-policy: FixedTime
ds-cfg-size-limit: 104857600
ds-cfg-log-file: logs/access
ds-cfg-logger-class: org.opends.server.loggers.DirectoryAccessLogger
ds-cfg-fixed-time-limit: 86400000
ds-cfg-suppress-internal-operations: false
cn: File-Based Access Logger
ds-cfg-logger-enabled: true
ds-cfg-size-limit: 104857600

dn: cn=File-Based Audit Logger,cn=Loggers,cn=config
objectClass: top
objectClass: ds-cfg-logger
objectClass: ds-cfg-access-logger
objectClass: ds-cfg-file-based-access-logger
cn: File-Based Audit Logger
ds-cfg-logger-class: org.opends.server.loggers.DirectoryAuditLogger
ds-cfg-logger-enabled: false
ds-cfg-log-file: logs/audit
ds-cfg-suppress-internal-operations: true
objectClass: ds-cfg-logger
objectClass: top
objectClass: ds-cfg-access-logger
ds-cfg-rotation-policy: Size
ds-cfg-rotation-policy: FixedTime
ds-cfg-size-limit: 104857600
ds-cfg-log-file: logs/audit
ds-cfg-logger-class: org.opends.server.loggers.DirectoryAuditLogger
ds-cfg-fixed-time-limit: 86400000
ds-cfg-suppress-internal-operations: true
cn: File-Based Audit Logger
ds-cfg-logger-enabled: false
ds-cfg-size-limit: 104857600

dn: cn=File-Based Debug Logger,cn=Loggers,cn=config
objectClass: top
objectClass: ds-cfg-logger
objectClass: ds-cfg-debug-logger
objectClass: top
objectClass: ds-cfg-file-based-debug-logger
cn: File-Based Debug Logger
ds-cfg-logger-class: org.opends.server.loggers.DirectoryDebugLogger
ds-cfg-logger-enabled: true
objectClass: ds-cfg-debug-logger
ds-cfg-log-file: logs/debug
ds-cfg-override-severity: EXCEPTION=INFO
ds-cfg-logger-class: org.opends.server.loggers.DirectoryDebugLogger
ds-cfg-default-severity: ERROR
ds-cfg-default-severity: WARNING
cn: File-Based Debug Logger
ds-cfg-logger-enabled: true

dn: cn=File-Based Error Logger,cn=Loggers,cn=config
objectClass: top
objectClass: ds-cfg-logger
objectClass: ds-cfg-error-logger
objectClass: top
objectClass: ds-cfg-file-based-error-logger
cn: File-Based Error Logger
ds-cfg-logger-class: org.opends.server.loggers.DirectoryErrorLogger
ds-cfg-logger-enabled: true
ds-cfg-rotation-policy: Size
ds-cfg-rotation-policy: FixedTime
ds-cfg-log-file: logs/errors
ds-cfg-logger-class: org.opends.server.loggers.DirectoryErrorLogger
ds-cfg-fixed-time-limit: 86400000
ds-cfg-default-severity: FATAL_ERROR
ds-cfg-default-severity: NOTICE
ds-cfg-default-severity: SEVERE_ERROR
ds-cfg-default-severity: SEVERE_WARNING
ds-cfg-rotation-policy: Size
ds-cfg-rotation-policy: FixedTime
cn: File-Based Error Logger
ds-cfg-logger-enabled: true
ds-cfg-size-limit: 104857600
ds-cfg-fixed-time-limit: 86400000

dn: cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Matching Rules

dn: cn=Auth Password Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Auth Password Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.AuthPasswordEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Auth Password Exact Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Auth Password Exact Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.AuthPasswordExactEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Bit String Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Bit String Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.BitStringEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Boolean Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Boolean Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.BooleanEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Exact Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Exact Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseExactEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Exact Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: Case Exact Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseExactOrderingMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Exact Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Case Exact Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseExactSubstringMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Exact IA5 Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Exact IA5 Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseExactIA5EqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Exact IA5 Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Exact IA5 Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseExactIA5SubstringMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Ignore Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
cn: Case Ignore Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Ignore Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
dn: cn=Case Exact Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
cn: Case Ignore Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreOrderingMatchingRule
objectClass: top
objectClass: ds-cfg-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Exact Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseExactOrderingMatchingRule

dn: cn=Case Ignore Substring Matching Rule,cn=Matching Rules,cn=config
dn: cn=Case Exact Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
cn: Case Ignore Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreSubstringMatchingRule
ds-cfg-matching-rule-enabled: true
cn: Case Exact Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseExactSubstringMatchingRule

dn: cn=Case Ignore IA5 Equality Matching Rule,cn=Matching Rules,cn=config
dn: cn=Case Ignore Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Ignore Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreEqualityMatchingRule

dn: cn=Case Ignore IA5 Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Ignore IA5 Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreIA5EqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Ignore IA5 Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Ignore IA5 Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreIA5SubstringMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Ignore List Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Ignore List Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreListEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Case Ignore List Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Ignore List Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreListSubstringMatchingRule

dn: cn=Case Ignore Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Ignore Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreOrderingMatchingRule

dn: cn=Case Ignore Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Case Ignore Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.CaseIgnoreSubstringMatchingRule

dn: cn=Directory String First Component Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Directory String First Component Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.DirectoryStringFirstComponentEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Distinguished Name Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Distinguished Name Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.DistinguishedNameEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Double Metaphone Approximate Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-approximate-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Double Metaphone Approximate Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.DoubleMetaphoneApproximateMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Generalized Time Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Generalized Time Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.GeneralizedTimeEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Generalized Time Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Generalized Time Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.GeneralizedTimeOrderingMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Historical CSN Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
ds-cfg-matching-rule-class: org.opends.server.synchronization.plugin.HistoricalCsnOrderingMatchingRule
ds-cfg-matching-rule-enabled: true
cn: Historical CSN Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.synchronization.plugin.HistoricalCsnOrderingMatchingRule

dn: cn=Integer Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Integer Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.IntegerEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Integer Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
cn: Integer Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.IntegerOrderingMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Integer First Component Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Integer First Component Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.IntegerFirstComponentEqualityMatchingRule

dn: cn=Integer Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Integer Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.IntegerOrderingMatchingRule

dn: cn=Keyword Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Keyword Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.KeywordEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Numeric String Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Numeric String Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.NumericStringEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Numeric String Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Numeric String Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.NumericStringOrderingMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Numeric String Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Numeric String Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.NumericStringSubstringMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Object Identifier Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Object Identifier Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.ObjectIdentifierEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Object Identifier First Component Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Object Identifier First Component Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.ObjectIdentifierFirstComponentEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Octet String Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Octet String Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.OctetStringEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Octet String Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Octet String Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.OctetStringOrderingMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Octet String Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Octet String Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.OctetStringSubstringMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Presentation Address Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Presentation Address Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.PresentationAddressEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Protocol Information Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Protocol Information Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.ProtocolInformationEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Telephone Number Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Telephone Number Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.TelephoneNumberEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Telephone Number Substring Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Telephone Number Substring Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.TelephoneNumberSubstringMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Unique Member Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Unique Member Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.UniqueMemberEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=User Password Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: User Password Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.UserPasswordEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=User Password Exact Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: User Password Exact Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.UserPasswordExactEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=UUID Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-equality-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-equality-matching-rule
ds-cfg-matching-rule-enabled: true
cn: UUID Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.UUIDEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=UUID Ordering Matching Rule,cn=Matching Rules,cn=config
objectClass: ds-cfg-ordering-matching-rule
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-ordering-matching-rule
ds-cfg-matching-rule-enabled: true
cn: UUID Ordering Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.UUIDOrderingMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Word Equality Matching Rule,cn=Matching Rules,cn=config
objectClass: top
objectClass: ds-cfg-matching-rule
objectClass: ds-cfg-substring-matching-rule
ds-cfg-matching-rule-enabled: true
cn: Word Equality Matching Rule
ds-cfg-matching-rule-class: org.opends.server.schema.WordEqualityMatchingRule
ds-cfg-matching-rule-enabled: true

dn: cn=Monitor Providers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Monitor Providers

dn: cn=JVM Stack Trace,cn=Monitor Providers,cn=config
objectClass: top
objectClass: ds-cfg-monitor-provider
cn: JVM Stack Trace
objectClass: top
ds-cfg-monitor-provider-class: org.opends.server.monitors.StackTraceMonitorProvider
ds-cfg-monitor-provider-enabled: true
cn: JVM Stack Trace

dn: cn=System Info,cn=Monitor Providers,cn=config
objectClass: top
objectClass: ds-cfg-monitor-provider
cn: System Info
objectClass: top
ds-cfg-monitor-provider-class: org.opends.server.monitors.SystemInfoMonitorProvider
ds-cfg-monitor-provider-enabled: true
cn: System Info

dn: cn=Version,cn=Monitor Providers,cn=config
objectClass: top
objectClass: ds-cfg-monitor-provider
cn: Version
objectClass: top
ds-cfg-monitor-provider-class: org.opends.server.monitors.VersionMonitorProvider
ds-cfg-monitor-provider-enabled: true
cn: Version

dn: cn=Password Generators,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Password Generators

dn: cn=Random Password Generator,cn=Password Generators,cn=config
objectClass: top
objectClass: ds-cfg-password-generator
objectClass: top
objectClass: ds-cfg-random-password-generator
cn: Random Password Generator
ds-cfg-password-generator-class: org.opends.server.extensions.RandomPasswordGenerator
ds-cfg-password-generator-enabled: true
ds-cfg-password-format: alpha:3,numeric:2,alpha:3
ds-cfg-password-character-set: alpha:abcdefghijklmnopqrstuvwxyz
ds-cfg-password-character-set: numeric:0123456789
ds-cfg-password-format: alpha:3,numeric:2,alpha:3
ds-cfg-password-generator-enabled: true
cn: Random Password Generator

dn: cn=Password Policies,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Password Policies

dn: cn=Default Password Policy,cn=Password Policies,cn=config
objectClass: top
dn: cn=Clear UserPassword Policy,cn=Password Policies,cn=config
objectClass: ds-cfg-password-policy
cn: Default Password Policy
ds-cfg-password-attribute: userPassword
ds-cfg-default-password-storage-scheme: SSHA
ds-cfg-allow-expired-password-changes: false
ds-cfg-allow-multiple-password-values: false
ds-cfg-allow-pre-encoded-passwords: false
ds-cfg-allow-user-password-changes: true
ds-cfg-expire-passwords-without-warning: false
ds-cfg-force-change-on-add: false
ds-cfg-force-change-on-reset: false
ds-cfg-grace-login-count: 0
ds-cfg-idle-lockout-interval: 0 seconds
ds-cfg-lockout-failure-count: 0
objectClass: top
ds-cfg-skip-validation-for-administrators: false
ds-cfg-lockout-duration: 0 seconds
ds-cfg-maximum-password-age: 0 seconds
ds-cfg-lockout-failure-expiration-interval: 0 seconds
ds-cfg-allow-user-password-changes: true
ds-cfg-allow-multiple-password-values: false
ds-cfg-minimum-password-age: 0 seconds
ds-cfg-force-change-on-add: false
ds-cfg-allow-expired-password-changes: false
ds-cfg-password-attribute: userPassword
ds-cfg-lockout-failure-count: 0
ds-cfg-allow-pre-encoded-passwords: false
ds-cfg-require-secure-password-changes: false
ds-cfg-password-change-requires-current-password: false
ds-cfg-force-change-on-reset: false
ds-cfg-password-expiration-warning-interval: 5 days
ds-cfg-default-password-storage-scheme: CLEAR
ds-cfg-grace-login-count: 0
ds-cfg-maximum-password-reset-age: 0 seconds
ds-cfg-password-validator-dn: cn=Test Password Validator,cn=Password Validators,cn=config
ds-cfg-expire-passwords-without-warning: false
ds-cfg-idle-lockout-interval: 0 seconds
ds-cfg-password-generator-dn: cn=Random Password Generator,cn=Password Generators,cn=config
ds-cfg-require-secure-authentication: false
cn: Test AuthPassword Policy

dn: cn=Default Password Policy,cn=Password Policies,cn=config
objectClass: ds-cfg-password-policy
objectClass: top
ds-cfg-skip-validation-for-administrators: false
ds-cfg-password-expiration-warning-interval: 5 days
ds-cfg-default-password-storage-scheme: SSHA
ds-cfg-grace-login-count: 0
ds-cfg-lockout-duration: 0 seconds
ds-cfg-maximum-password-age: 0 seconds
ds-cfg-maximum-password-reset-age: 0 seconds
ds-cfg-password-expiration-warning-interval: 5 days
ds-cfg-lockout-failure-expiration-interval: 0 seconds
ds-cfg-allow-user-password-changes: true
ds-cfg-allow-multiple-password-values: false
ds-cfg-minimum-password-age: 0 seconds
ds-cfg-expire-passwords-without-warning: false
ds-cfg-idle-lockout-interval: 0 seconds
ds-cfg-password-generator-dn: cn=Random Password Generator,cn=Password Generators,cn=config
ds-cfg-password-change-requires-current-password: false
ds-cfg-require-secure-authentication: false
ds-cfg-force-change-on-add: false
ds-cfg-allow-expired-password-changes: false
ds-cfg-password-attribute: userPassword
ds-cfg-lockout-failure-count: 0
ds-cfg-allow-pre-encoded-passwords: false
cn: Default Password Policy
ds-cfg-require-secure-password-changes: false
ds-cfg-skip-validation-for-administrators: false
ds-cfg-password-change-requires-current-password: false
ds-cfg-force-change-on-reset: false
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010844Z

dn: cn=Root Password Policy,cn=Password Policies,cn=config
objectClass: top
objectClass: ds-cfg-password-policy
cn: Root Password Policy
ds-cfg-password-attribute: userPassword
objectClass: top
ds-cfg-password-expiration-warning-interval: 5 days
ds-cfg-skip-validation-for-administrators: false
ds-cfg-default-password-storage-scheme: SSHA
ds-cfg-allow-expired-password-changes: false
ds-cfg-allow-multiple-password-values: false
ds-cfg-allow-pre-encoded-passwords: false
ds-cfg-allow-user-password-changes: true
ds-cfg-expire-passwords-without-warning: false
ds-cfg-force-change-on-add: false
ds-cfg-force-change-on-reset: false
ds-cfg-grace-login-count: 0
ds-cfg-idle-lockout-interval: 0 seconds
ds-cfg-lockout-failure-count: 0
ds-cfg-lockout-duration: 0 seconds
ds-cfg-maximum-password-reset-age: 0 seconds
ds-cfg-maximum-password-age: 0 seconds
ds-cfg-lockout-failure-expiration-interval: 0 seconds
ds-cfg-allow-multiple-password-values: false
ds-cfg-allow-user-password-changes: true
ds-cfg-minimum-password-age: 0 seconds
ds-cfg-expire-passwords-without-warning: false
ds-cfg-idle-lockout-interval: 0 seconds
ds-cfg-require-secure-authentication: false
ds-cfg-force-change-on-add: false
ds-cfg-allow-pre-encoded-passwords: false
ds-cfg-allow-expired-password-changes: false
ds-cfg-password-attribute: userPassword
ds-cfg-lockout-failure-count: 0
cn: Root Password Policy
ds-cfg-require-secure-password-changes: false
ds-cfg-password-change-requires-current-password: true
ds-cfg-force-change-on-reset: false

dn: cn=SHA1 AuthPassword Policy,cn=Password Policies,cn=config
objectClass: ds-cfg-password-policy
objectClass: top
ds-cfg-skip-validation-for-administrators: false
ds-cfg-password-expiration-warning-interval: 5 days
ds-cfg-default-password-storage-scheme: SHA1
ds-cfg-grace-login-count: 0
ds-cfg-lockout-duration: 0 seconds
ds-cfg-maximum-password-age: 0 seconds
ds-cfg-maximum-password-reset-age: 0 seconds
ds-cfg-password-expiration-warning-interval: 5 days
ds-cfg-password-change-requires-current-password: true
ds-cfg-lockout-failure-expiration-interval: 0 seconds
ds-cfg-allow-user-password-changes: true
ds-cfg-allow-multiple-password-values: false
ds-cfg-minimum-password-age: 0 seconds
ds-cfg-expire-passwords-without-warning: false
ds-cfg-idle-lockout-interval: 0 seconds
ds-cfg-password-generator-dn: cn=Random Password Generator,cn=Password Generators,cn=config
ds-cfg-require-secure-authentication: false
ds-cfg-force-change-on-add: false
ds-cfg-allow-expired-password-changes: false
ds-cfg-password-attribute: authPassword
ds-cfg-lockout-failure-count: 0
ds-cfg-allow-pre-encoded-passwords: false
cn: SHA1 AuthPassword Policy
ds-cfg-require-secure-password-changes: false
ds-cfg-password-change-requires-current-password: false
ds-cfg-force-change-on-reset: false
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010844Z

dn: cn=SSHA512 UserPassword Policy,cn=Password Policies,cn=config
objectClass: ds-cfg-password-policy
objectClass: top
ds-cfg-skip-validation-for-administrators: false
ds-cfg-lockout-duration: 0 seconds
ds-cfg-maximum-password-age: 0 seconds
ds-cfg-lockout-failure-expiration-interval: 0 seconds
ds-cfg-allow-user-password-changes: true
ds-cfg-allow-multiple-password-values: false
ds-cfg-minimum-password-age: 0 seconds
ds-cfg-force-change-on-add: false
ds-cfg-allow-expired-password-changes: false
ds-cfg-password-attribute: userPassword
ds-cfg-lockout-failure-count: 0
ds-cfg-allow-pre-encoded-passwords: false
ds-cfg-require-secure-password-changes: false
ds-cfg-password-change-requires-current-password: false
ds-cfg-force-change-on-reset: false
ds-cfg-password-expiration-warning-interval: 5 days
ds-cfg-default-password-storage-scheme: SSHA512
ds-cfg-grace-login-count: 0
ds-cfg-maximum-password-reset-age: 0 seconds
ds-cfg-password-validator-dn: cn=Test Password Validator,cn=Password Validators,cn=config
ds-cfg-expire-passwords-without-warning: false
ds-cfg-idle-lockout-interval: 0 seconds
ds-cfg-password-generator-dn: cn=Random Password Generator,cn=Password Generators,cn=config
ds-cfg-require-secure-authentication: false
cn: SSHA512 UserPassword Policy

dn: cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Password Storage Schemes

dn: cn=Base64,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: Base64
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.Base64PasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.Base64PasswordStorageScheme
cn: Base64

dn: cn=Clear,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: Clear
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.ClearPasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.ClearPasswordStorageScheme
cn: Clear

dn: cn=MD5,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: MD5
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.MD5PasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.MD5PasswordStorageScheme
cn: MD5

dn: cn=Salted MD5,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: Salted MD5
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedMD5PasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedMD5PasswordStorageScheme
cn: Salted MD5

dn: cn=Salted SHA-1,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: Salted SHA-1
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedSHA1PasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedSHA1PasswordStorageScheme
cn: Salted SHA-1

dn: cn=Salted SHA-256,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: Salted SHA-256
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedSHA256PasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedSHA256PasswordStorageScheme
cn: Salted SHA-256

dn: cn=Salted SHA-384,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: Salted SHA-384
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedSHA384PasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedSHA384PasswordStorageScheme
cn: Salted SHA-384

dn: cn=Salted SHA-512,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: Salted SHA-512
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedSHA512PasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SaltedSHA512PasswordStorageScheme
cn: Salted SHA-512

dn: cn=SHA-1,cn=Password Storage Schemes,cn=config
objectClass: top
objectClass: ds-cfg-password-storage-scheme
cn: SHA-1
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SHA1PasswordStorageScheme
ds-cfg-password-storage-scheme-enabled: true
ds-cfg-password-storage-scheme-class: org.opends.server.extensions.SHA1PasswordStorageScheme
cn: SHA-1

dn: cn=Password Validators,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Password Validators

dn: cn=Length-Based Password Validator,cn=Password Validators,cn=config
objectClass: top
objectClass: ds-cfg-password-validator
objectClass: top
objectClass: ds-cfg-length-based-password-validator
cn: Length-Based Password Validator
ds-cfg-password-validator-class: org.opends.server.extensions.LengthBasedPasswordValidator
ds-cfg-password-validator-enabled: true
ds-cfg-minimum-password-length: 6
ds-cfg-maximum-password-length: 0
ds-cfg-password-validator-class: org.opends.server.extensions.LengthBasedPasswordValidator
ds-cfg-minimum-password-length: 6
cn: Length-Based Password Validator
ds-cfg-password-validator-enabled: true

dn: cn=Test Password Validator,cn=Password Validators,cn=config
objectClass: ds-cfg-password-validator
objectClass: top
ds-cfg-password-validator-class: org.opends.server.extensions.TestPasswordValidator
cn: Test Password Validator
ds-cfg-password-validator-enabled: true

dn: cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Plugins

dn: cn=Delay PreOperation Plugin,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
ds-cfg-plugin-class: org.opends.server.plugins.DelayPreOpPlugin
ds-cfg-plugin-enabled: true
cn: Delay PreOperation Plugin
ds-cfg-plugin-type: preOperationAdd
ds-cfg-plugin-type: preOperationBind
ds-cfg-plugin-type: preOperationCompare
ds-cfg-plugin-type: preOperationDelete
ds-cfg-plugin-type: preOperationExtended
ds-cfg-plugin-type: preOperationModify
ds-cfg-plugin-type: preOperationModifyDN
ds-cfg-plugin-type: preOperationSearch

dn: cn=Disconnect Client Plugin,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
ds-cfg-plugin-class: org.opends.server.plugins.DisconnectClientPlugin
ds-cfg-plugin-enabled: true
cn: Disconnect Client Plugin
ds-cfg-plugin-type: preParseAbandon
ds-cfg-plugin-type: preParseAdd
ds-cfg-plugin-type: preParseBind
ds-cfg-plugin-type: preParseCompare
ds-cfg-plugin-type: preParseDelete
ds-cfg-plugin-type: preParseExtended
ds-cfg-plugin-type: preParseModify
ds-cfg-plugin-type: preParseModifyDN
ds-cfg-plugin-type: preParseSearch
ds-cfg-plugin-type: preParseUnbind
ds-cfg-plugin-type: preOperationAdd
ds-cfg-plugin-type: preOperationBind
ds-cfg-plugin-type: preOperationCompare
ds-cfg-plugin-type: preOperationDelete
ds-cfg-plugin-type: preOperationExtended
ds-cfg-plugin-type: preOperationModify
ds-cfg-plugin-type: preOperationModifyDN
ds-cfg-plugin-type: preOperationSearch
ds-cfg-plugin-type: postOperationAbandon
ds-cfg-plugin-type: postOperationAdd
ds-cfg-plugin-type: postOperationBind
ds-cfg-plugin-type: postOperationCompare
ds-cfg-plugin-type: postOperationDelete
ds-cfg-plugin-type: postOperationExtended
ds-cfg-plugin-type: postOperationModify
ds-cfg-plugin-type: postOperationModifyDN
ds-cfg-plugin-type: postOperationSearch
ds-cfg-plugin-type: postOperationUnbind
ds-cfg-plugin-type: postResponseAdd
ds-cfg-plugin-type: postResponseBind
ds-cfg-plugin-type: postResponseCompare
ds-cfg-plugin-type: postResponseDelete
ds-cfg-plugin-type: postResponseExtended
ds-cfg-plugin-type: postResponseModify
ds-cfg-plugin-type: postResponseModifyDN
ds-cfg-plugin-type: postResponseSearch

dn: cn=Entry UUID,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
cn: Entry UUID
ds-cfg-plugin-class: org.opends.server.plugins.EntryUUIDPlugin
ds-cfg-plugin-enabled: true
cn: Entry UUID
ds-cfg-plugin-type: ldifImport
ds-cfg-plugin-type: preOperationAdd

dn: cn=Invocation Counter Plugin,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
ds-cfg-plugin-class: org.opends.server.plugins.InvocationCounterPlugin
ds-cfg-plugin-enabled: true
cn: Invocation Counter Plugin
ds-cfg-plugin-type: preParseAbandon
ds-cfg-plugin-type: preParseAdd
ds-cfg-plugin-type: preParseBind
ds-cfg-plugin-type: preParseCompare
ds-cfg-plugin-type: preParseDelete
ds-cfg-plugin-type: preParseExtended
ds-cfg-plugin-type: preParseModify
ds-cfg-plugin-type: preParseModifyDN
ds-cfg-plugin-type: preParseSearch
ds-cfg-plugin-type: preParseUnbind
ds-cfg-plugin-type: preOperationAdd
ds-cfg-plugin-type: preOperationBind
ds-cfg-plugin-type: preOperationCompare
ds-cfg-plugin-type: preOperationDelete
ds-cfg-plugin-type: preOperationExtended
ds-cfg-plugin-type: preOperationModify
ds-cfg-plugin-type: preOperationModifyDN
ds-cfg-plugin-type: preOperationSearch
ds-cfg-plugin-type: postOperationAbandon
ds-cfg-plugin-type: postOperationAdd
ds-cfg-plugin-type: postOperationBind
ds-cfg-plugin-type: postOperationCompare
ds-cfg-plugin-type: postOperationDelete
ds-cfg-plugin-type: postOperationExtended
ds-cfg-plugin-type: postOperationModify
ds-cfg-plugin-type: postOperationModifyDN
ds-cfg-plugin-type: postOperationSearch
ds-cfg-plugin-type: postOperationUnbind
ds-cfg-plugin-type: postResponseAdd
ds-cfg-plugin-type: postResponseBind
ds-cfg-plugin-type: postResponseCompare
ds-cfg-plugin-type: postResponseDelete
ds-cfg-plugin-type: postResponseExtended
ds-cfg-plugin-type: postResponseModify
ds-cfg-plugin-type: postResponseModifyDN
ds-cfg-plugin-type: postResponseSearch
ds-cfg-plugin-type: searchResultEntry
ds-cfg-plugin-type: searchResultReference
ds-cfg-plugin-type: intermediateResponse
ds-cfg-plugin-type: postConnect
ds-cfg-plugin-type: postDisconnect
ds-cfg-plugin-type: ldifImport
ds-cfg-plugin-type: ldifExport
ds-cfg-plugin-type: startup
ds-cfg-plugin-type: shutdown

dn: cn=LastMod,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
cn: LastMod
ds-cfg-plugin-class: org.opends.server.plugins.LastModPlugin
ds-cfg-plugin-enabled: true
cn: LastMod
ds-cfg-plugin-type: preOperationAdd
ds-cfg-plugin-type: preOperationModify
ds-cfg-plugin-type: preOperationModifyDN
@@ -1115,35 +1425,68 @@
dn: cn=LDAP Attribute Description List,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
cn: LDAP Attribute Description List
ds-cfg-plugin-class: org.opends.server.plugins.LDAPADListPlugin
ds-cfg-plugin-enabled: true
cn: LDAP Attribute Description List
ds-cfg-plugin-type: preParseSearch

dn: cn=Password Policy Import,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
cn: Password Policy Import
ds-cfg-plugin-class: org.opends.server.plugins.PasswordPolicyImportPlugin
ds-cfg-plugin-enabled: true
cn: Password Policy Import
ds-cfg-plugin-type: ldifImport

dn: cn=Profiler,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
objectClass: ds-cfg-profiler-plugin
cn: Profiler
ds-cfg-plugin-enabled: true
objectClass: ds-cfg-plugin
ds-cfg-plugin-class: org.opends.server.plugins.profiler.ProfilerPlugin
ds-cfg-profile-sample-interval: 10 milliseconds
ds-cfg-plugin-enabled: true
ds-cfg-profile-directory: logs
cn: Profiler
ds-cfg-plugin-type: startup
ds-cfg-enable-profiling-on-startup: false
ds-cfg-profile-directory: logs
ds-cfg-profile-sample-interval: 10 milliseconds

dn: cn=Short Circuit Plugin,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
ds-cfg-plugin-class: org.opends.server.plugins.ShortCircuitPlugin
ds-cfg-plugin-enabled: true
cn: Short Circuit Plugin
ds-cfg-plugin-type: preParseAbandon
ds-cfg-plugin-type: preParseAdd
ds-cfg-plugin-type: preParseBind
ds-cfg-plugin-type: preParseCompare
ds-cfg-plugin-type: preParseDelete
ds-cfg-plugin-type: preParseExtended
ds-cfg-plugin-type: preParseModify
ds-cfg-plugin-type: preParseModifyDN
ds-cfg-plugin-type: preParseSearch
ds-cfg-plugin-type: preParseUnbind
ds-cfg-plugin-type: preOperationAdd
ds-cfg-plugin-type: preOperationBind
ds-cfg-plugin-type: preOperationCompare
ds-cfg-plugin-type: preOperationDelete
ds-cfg-plugin-type: preOperationExtended
ds-cfg-plugin-type: preOperationModify
ds-cfg-plugin-type: preOperationModifyDN
ds-cfg-plugin-type: preOperationSearch

dn: cn=Update PreOperation Plugin,cn=Plugins,cn=config
objectClass: top
objectClass: ds-cfg-plugin
ds-cfg-plugin-class: org.opends.server.plugins.UpdatePreOpPlugin
ds-cfg-plugin-enabled: true
cn: Delay PreOperation Plugin
ds-cfg-plugin-type: preOperationAdd
ds-cfg-plugin-type: preOperationModify

dn: cn=Root DNs,cn=config
objectClass: top
objectClass: ds-cfg-root-dn-base
cn: Root DNs
objectClass: top
ds-cfg-default-root-privilege-name: bypass-acl
ds-cfg-default-root-privilege-name: modify-acl
ds-cfg-default-root-privilege-name: config-read
@@ -1160,475 +1503,503 @@
ds-cfg-default-root-privilege-name: password-reset
ds-cfg-default-root-privilege-name: update-schema
ds-cfg-default-root-privilege-name: privilege-change
cn: Root DNs
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301011032Z

dn: cn=Directory Manager,cn=Root DNs,cn=config
objectClass: top
objectClass: person
objectClass: organizationalPerson
objectClass: inetOrgPerson
objectClass: person
objectClass: top
objectClass: organizationalPerson
objectClass: ds-cfg-root-dn
userPassword: {SSHA}bT3wAPjyrpVlzX5548I8vvhZ91xIMPWiHRSR3Q==
cn: Directory Manager
givenName: Directory
sn: Manager
userPassword: {SSHA512}l1t43vVl7Uh03PpQ2vCsT0B7Q0HTi+tKJmH7tZTmSGaKrMHWHO1czfwEsjMgfbeQoiYQDGDuxolipR0H6ajMu1YHlTjPNG9Z
givenName: Directory
ds-cfg-alternate-bind-dn: cn=Directory Manager
ds-rlim-size-limit: 0
modifiersName: cn=Directory Manager,cn=Root DNs,cn=config
ds-rlim-time-limit: 0
modifyTimestamp: 20070301010844Z
pwdChangedTime: 20070301010844.840Z
ds-rlim-lookthrough-limit: 0
ds-rlim-size-limit: 0
ds-pwp-password-policy-dn: cn=Root Password Policy,cn=Password Policies,cn=config

dn: cn=Root DSE,cn=config
dn: cn=Proxy Root,cn=Root DNs,cn=config
objectClass: inetOrgPerson
objectClass: person
objectClass: top
objectClass: organizationalPerson
objectClass: ds-cfg-root-dn
sn: Root
userPassword: {SSHA}BrU+IXUb4GWXKe6Zeb6DQAzTVcaw3LUj7JcpVQ==
cn: Proxy Root
uid: proxy.root
givenName: Proxy
pwdChangedTime: 20070301011015.945Z
entryUUID: f3f5c38a-2c20-4f31-a6ce-e5c0af21da82
createTimestamp: 20070301011015Z
creatorsName: cn=Internal Client,cn=Root DNs,cn=config
ds-privilege-name: proxied-auth

dn: cn=Root DSE,cn=config
objectClass: ds-cfg-root-dse
cn: Root DSE
objectClass: top
ds-cfg-show-all-attributes: false
cn: Root DSE

dn: cn=SASL Mechanisms,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: SASL Mechanisms

dn: cn=ANONYMOUS,cn=SASL Mechanisms,cn=config
objectClass: top
objectClass: ds-cfg-sasl-mechanism-handler
cn: ANONYMOUS
objectClass: top
ds-cfg-sasl-mechanism-handler-class: org.opends.server.extensions.AnonymousSASLMechanismHandler
ds-cfg-sasl-mechanism-handler-enabled: false
cn: ANONYMOUS

dn: cn=CRAM-MD5,cn=SASL Mechanisms,cn=config
objectClass: top
objectClass: ds-cfg-sasl-mechanism-handler
objectClass: top
objectClass: ds-cfg-cram-md5-sasl-mechanism-handler
cn: CRAM-MD5
ds-cfg-sasl-mechanism-handler-class: org.opends.server.extensions.CRAMMD5SASLMechanismHandler
ds-cfg-sasl-mechanism-handler-enabled: true
cn: CRAM-MD5
ds-cfg-identity-mapper-dn: cn=Exact Match,cn=Identity Mappers,cn=config

dn: cn=DIGEST-MD5,cn=SASL Mechanisms,cn=config
objectClass: top
objectClass: ds-cfg-sasl-mechanism-handler
objectClass: top
objectClass: ds-cfg-digest-md5-sasl-mechanism-handler
cn: DIGEST-MD5
ds-cfg-sasl-mechanism-handler-class: org.opends.server.extensions.DigestMD5SASLMechanismHandler
ds-cfg-sasl-mechanism-handler-enabled: true
cn: DIGEST-MD5
ds-cfg-identity-mapper-dn: cn=Exact Match,cn=Identity Mappers,cn=config

dn: cn=EXTERNAL,cn=SASL Mechanisms,cn=config
objectClass: top
objectClass: ds-cfg-sasl-mechanism-handler
objectClass: top
objectClass: ds-cfg-external-sasl-mechanism-handler
cn: EXTERNAL
ds-cfg-sasl-mechanism-handler-class: org.opends.server.extensions.ExternalSASLMechanismHandler
ds-cfg-sasl-mechanism-handler-enabled: true
ds-cfg-client-certificate-validation-policy: ifpresent
ds-cfg-certificate-attribute: userCertificate
cn: EXTERNAL
ds-cfg-certificate-mapper-dn: cn=Subject Equals DN,cn=Certificate Mappers,cn=config
ds-cfg-sasl-mechanism-handler-class: org.opends.server.extensions.ExternalSASLMechanismHandler
ds-cfg-certificate-attribute: userCertificate
ds-cfg-client-certificate-validation-policy: ifpresent
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010846Z

dn: cn=GSSAPI,cn=SASL Mechanisms,cn=config
objectClass: top
objectClass: ds-cfg-sasl-mechanism-handler
objectClass: ds-cfg-gssapi-sasl-mechanism-handler
cn: GSSAPI
objectClass: top
ds-cfg-sasl-mechanism-handler-class: org.opends.server.extensions.GSSAPISASLMechanismHandler
ds-cfg-sasl-mechanism-handler-enabled: false
ds-cfg-identity-mapper-dn: cn=Exact Match,cn=Identity Mappers,cn=config
ds-cfg-keytab: /etc/krb5/krb5.keytab
ds-cfg-sasl-mechanism-handler-enabled: false
cn: GSSAPI
ds-cfg-identity-mapper-dn: cn=Exact Match,cn=Identity Mappers,cn=config

dn: cn=PLAIN,cn=SASL Mechanisms,cn=config
objectClass: top
objectClass: ds-cfg-sasl-mechanism-handler
objectClass: ds-cfg-plain-sasl-mechanism-handler
cn: PLAIN
objectClass: top
ds-cfg-sasl-mechanism-handler-class: org.opends.server.extensions.PlainSASLMechanismHandler
ds-cfg-sasl-mechanism-handler-enabled: true
cn: PLAIN
ds-cfg-identity-mapper-dn: cn=Exact Match,cn=Identity Mappers,cn=config

dn: cn=Synchronization Providers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Synchronization Providers

dn: cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Syntaxes

dn: cn=Absolute Subtree Specification,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Absolute Subtree Specification
ds-cfg-syntax-class: org.opends.server.schema.AbsoluteSubtreeSpecificationSyntax
ds-cfg-syntax-enabled: true
cn: Absolute Subtree Specification

dn: cn=Attribute Type Description,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Attribute Type Description
ds-cfg-syntax-class: org.opends.server.schema.AttributeTypeSyntax
ds-cfg-syntax-enabled: true
cn: Attribute Type Description

dn: cn=Authentication Password,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Authentiation Password
ds-cfg-syntax-class: org.opends.server.schema.AuthPasswordSyntax
ds-cfg-syntax-enabled: true
cn: Authentiation Password

dn: cn=Binary,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Binary
ds-cfg-syntax-class: org.opends.server.schema.BinarySyntax
ds-cfg-syntax-enabled: true
cn: Binary

dn: cn=Bit String,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Bit String
ds-cfg-syntax-class: org.opends.server.schema.BitStringSyntax
ds-cfg-syntax-enabled: true
cn: Bit String

dn: cn=Boolean,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Boolean
ds-cfg-syntax-class: org.opends.server.schema.BooleanSyntax
ds-cfg-syntax-enabled: true
cn: Boolean

dn: cn=Certificate,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Certificate
ds-cfg-syntax-class: org.opends.server.schema.CertificateSyntax
ds-cfg-syntax-enabled: true
cn: Certificate

dn: cn=Certificate List,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Certificate List
ds-cfg-syntax-class: org.opends.server.schema.CertificateListSyntax
ds-cfg-syntax-enabled: true
cn: Certificate List

dn: cn=Certificate Pair,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Certificate Pair
ds-cfg-syntax-class: org.opends.server.schema.CertificatePairSyntax
ds-cfg-syntax-enabled: true
cn: Certificate Pair

dn: cn=Country String,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Country String
ds-cfg-syntax-class: org.opends.server.schema.CountryStringSyntax
ds-cfg-syntax-enabled: true
cn: Country String

dn: cn=Delivery Method,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Delivery Method
ds-cfg-syntax-class: org.opends.server.schema.DeliveryMethodSyntax
ds-cfg-syntax-enabled: true
cn: Delivery Method

dn: cn=Directory String,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
objectClass: ds-cfg-directory-string-attribute-syntax
cn: Directory String
objectClass: ds-cfg-attribute-syntax
ds-cfg-allow-zero-length-values: false
ds-cfg-syntax-class: org.opends.server.schema.DirectoryStringSyntax
ds-cfg-syntax-enabled: true
ds-cfg-allow-zero-length-values: false
cn: Directory String

dn: cn=Distinguished Name,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Distinguished Name
ds-cfg-syntax-class: org.opends.server.schema.DistinguishedNameSyntax
ds-cfg-syntax-enabled: true
cn: Distinguished Name

dn: cn=DIT Content Rule Description,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: DIT Content Rule Description
ds-cfg-syntax-class: org.opends.server.schema.DITContentRuleSyntax
ds-cfg-syntax-enabled: true
cn: DIT Content Rule Description

dn: cn=DIT Structure Rule Description,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: DIT Structure Rule Description
ds-cfg-syntax-class: org.opends.server.schema.DITStructureRuleSyntax
ds-cfg-syntax-enabled: true
cn: DIT Structure Rule Description

dn: cn=Enhanced Guide,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Enhanced Guide
ds-cfg-syntax-class: org.opends.server.schema.EnhancedGuideSyntax
ds-cfg-syntax-enabled: true
cn: Enhanced Guide

dn: cn=Facsimile Telephone Number,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Facsimile Telephone Number
ds-cfg-syntax-class: org.opends.server.schema.FaxNumberSyntax
ds-cfg-syntax-enabled: true
cn: Facsimile Telephone Number

dn: cn=Fax,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Fax
ds-cfg-syntax-class: org.opends.server.schema.FaxSyntax
ds-cfg-syntax-enabled: true
cn: Fax

dn: cn=Generalized Time,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Generalized Time
ds-cfg-syntax-class: org.opends.server.schema.GeneralizedTimeSyntax
ds-cfg-syntax-enabled: true
cn: Generalized Time

dn: cn=Guide,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Guide
ds-cfg-syntax-class: org.opends.server.schema.GuideSyntax
ds-cfg-syntax-enabled: true
cn: Guide

dn: cn=IA5 String,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: IA5 String
ds-cfg-syntax-class: org.opends.server.schema.IA5StringSyntax
ds-cfg-syntax-enabled: true
cn: IA5 String

dn: cn=Integer,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Integer
ds-cfg-syntax-class: org.opends.server.schema.IntegerSyntax
ds-cfg-syntax-enabled: true
cn: Integer

dn: cn=JPEG,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: JPEG
ds-cfg-syntax-class: org.opends.server.schema.JPEGSyntax
ds-cfg-syntax-enabled: true
cn: JPEG

dn: cn=LDAP Syntax Description,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: LDAP Syntax Description
ds-cfg-syntax-class: org.opends.server.schema.LDAPSyntaxDescriptionSyntax
ds-cfg-syntax-enabled: true
cn: LDAP Syntax Description

dn: cn=Matching Rule Description,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Matching Rule Description
ds-cfg-syntax-class: org.opends.server.schema.MatchingRuleSyntax
ds-cfg-syntax-enabled: true
cn: Matching Rule Description

dn: cn=Matching Rule Use Description,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Matching Rule Use Description
ds-cfg-syntax-class: org.opends.server.schema.MatchingRuleUseSyntax
ds-cfg-syntax-enabled: true
cn: Matching Rule Use Description

dn: cn=Name and Optional UID,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Name and Optional UID
ds-cfg-syntax-class: org.opends.server.schema.NameAndOptionalUIDSyntax
ds-cfg-syntax-enabled: true
cn: Name and Optional UID

dn: cn=Name Form Description,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Name Form Description
ds-cfg-syntax-class: org.opends.server.schema.NameFormSyntax
ds-cfg-syntax-enabled: true
cn: Name Form Description

dn: cn=Numeric String,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Numeric String
ds-cfg-syntax-class: org.opends.server.schema.NumericStringSyntax
ds-cfg-syntax-enabled: true
cn: Numeric String

dn: cn=Object Class Description,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Object Class Description
ds-cfg-syntax-class: org.opends.server.schema.ObjectClassSyntax
ds-cfg-syntax-enabled: true
cn: Object Class Description

dn: cn=Object Identifier,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Object Identifier
ds-cfg-syntax-class: org.opends.server.schema.OIDSyntax
ds-cfg-syntax-enabled: true
cn: Object Identifier

dn: cn=Octet String,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Octet String
ds-cfg-syntax-class: org.opends.server.schema.OctetStringSyntax
ds-cfg-syntax-enabled: true
cn: Octet String

dn: cn=Other Mailbox,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Other Mailbox
ds-cfg-syntax-class: org.opends.server.schema.OtherMailboxSyntax
ds-cfg-syntax-enabled: true
cn: Other Mailbox

dn: cn=Postal Address,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Postal Address
ds-cfg-syntax-class: org.opends.server.schema.PostalAddressSyntax
ds-cfg-syntax-enabled: true
cn: Postal Address

dn: cn=Presentation Address,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Presentation Address
ds-cfg-syntax-class: org.opends.server.schema.PresentationAddressSyntax
ds-cfg-syntax-enabled: true
cn: Presentation Address

dn: cn=Printable String,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Printable String
ds-cfg-syntax-class: org.opends.server.schema.PrintableStringSyntax
ds-cfg-syntax-enabled: true
cn: Printable String

dn: cn=Protocol Information,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Protocol Information
ds-cfg-syntax-class: org.opends.server.schema.ProtocolInformationSyntax
ds-cfg-syntax-enabled: true
cn: Protocol Information

dn: cn=Relative Subtree Specification,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Relative Subtree Specification
ds-cfg-syntax-class: org.opends.server.schema.RelativeSubtreeSpecificationSyntax
ds-cfg-syntax-enabled: true
cn: Relative Subtree Specification

dn: cn=Substring Assertion,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Substring Assertion
ds-cfg-syntax-class: org.opends.server.schema.SubstringAssertionSyntax
ds-cfg-syntax-enabled: true
cn: Substring Assertion

dn: cn=Subtree Specification,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Subtree Specification
ds-cfg-syntax-class: org.opends.server.schema.RFC3672SubtreeSpecificationSyntax
ds-cfg-syntax-enabled: true
cn: Subtree Specification

dn: cn=Supported Algorithm,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Supported Algorithm
ds-cfg-syntax-class: org.opends.server.schema.SupportedAlgorithmSyntax
ds-cfg-syntax-enabled: true
cn: Supported Algorithm

dn: cn=Telephone Number,cn=Syntaxes,cn=config
objectClass: ds-cfg-telephone-number-attribute-syntax
objectClass: top
objectClass: ds-cfg-attribute-syntax
objectClass: ds-cfg-telephone-number-attribute-syntax
cn: Telephone Number
ds-cfg-syntax-class: org.opends.server.schema.TelephoneNumberSyntax
ds-cfg-syntax-enabled: true
ds-cfg-strict-telephone-number-format: false
cn: Telephone Number

dn: cn=Teletex Terminal Identifier,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Teletex Terminal Identifier
ds-cfg-syntax-class: org.opends.server.schema.TeletexTerminalIdentifierSyntax
ds-cfg-syntax-enabled: true
cn: Teletex Terminal Identifier

dn: cn=Telex Number,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: Telex Number
ds-cfg-syntax-class: org.opends.server.schema.TelexNumberSyntax
ds-cfg-syntax-enabled: true

dn: cn=UTC Time,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: UTC Time
ds-cfg-syntax-class: org.opends.server.schema.UTCTimeSyntax
ds-cfg-syntax-enabled: true
cn: Telex Number

dn: cn=User Password,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: User Password
ds-cfg-syntax-class: org.opends.server.schema.UserPasswordSyntax
ds-cfg-syntax-enabled: true
cn: User Password

dn: cn=UTC Time,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
ds-cfg-syntax-class: org.opends.server.schema.UTCTimeSyntax
ds-cfg-syntax-enabled: true
cn: UTC Time

dn: cn=UUID,cn=Syntaxes,cn=config
objectClass: top
objectClass: ds-cfg-attribute-syntax
cn: UUID
ds-cfg-syntax-class: org.opends.server.schema.UUIDSyntax
ds-cfg-syntax-enabled: true
cn: UUID

dn: cn=Trust Manager Providers,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Trust Manager Providers

dn: cn=Blind Trust,cn=Trust Manager Providers,cn=config
objectClass: top
objectClass: ds-cfg-trust-manager-provider
cn: Blind Trust
ds-cfg-trust-manager-provider-class: org.opends.server.extensions.BlindTrustManagerProvider
objectClass: top
ds-cfg-trust-manager-provider-enabled: false
ds-cfg-trust-manager-provider-class: org.opends.server.extensions.BlindTrustManagerProvider
cn: Blind Trust

dn: cn=JKS,cn=Trust Manager Providers,cn=config
objectClass: top
objectClass: ds-cfg-trust-manager-provider
objectClass: top
objectClass: ds-cfg-file-based-trust-manager-provider
cn: JKS
ds-cfg-trust-manager-provider-enabled: true
ds-cfg-trust-manager-provider-class: org.opends.server.extensions.FileBasedTrustManagerProvider
ds-cfg-trust-manager-provider-enabled: false
ds-cfg-trust-store-pin: password
ds-cfg-trust-store-type: JKS
ds-cfg-trust-store-file: config/truststore
cn: JKS
ds-cfg-trust-store-file: config/server.truststore

dn: cn=PKCS12,cn=Trust Manager Providers,cn=config
objectClass: top
objectClass: ds-cfg-trust-manager-provider
objectClass: top
objectClass: ds-cfg-file-based-trust-manager-provider
cn: PKCS12
ds-cfg-trust-manager-provider-class: org.opends.server.extensions.FileBasedTrustManagerProvider
ds-cfg-trust-manager-provider-enabled: false
ds-cfg-trust-manager-provider-class: org.opends.server.extensions.FileBasedTrustManagerProvider
ds-cfg-trust-store-type: PKCS12
cn: PKCS12
ds-cfg-trust-store-file: config/truststore.p12

dn: cn=Virtual Attributes,cn=config
objectClass: top
objectClass: ds-cfg-branch
objectClass: top
cn: Virtual Attributes

dn: cn=Work Queue,cn=config
objectClass: ds-cfg-traditional-work-queue
objectClass: top
objectClass: ds-cfg-work-queue
objectClass: ds-cfg-traditional-work-queue
ds-cfg-max-work-queue-capacity: 0
ds-cfg-num-worker-threads: 24
cn: Work Queue
ds-cfg-work-queue-class: org.opends.server.extensions.TraditionalWorkQueue
ds-cfg-num-worker-threads: 24
ds-cfg-max-work-queue-capacity: 0
modifiersName: cn=Internal Client,cn=Root DNs,cn=config
modifyTimestamp: 20070301010846Z


 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAbandonOperation.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.dsml.protocol;


 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLAddOperation.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.dsml.protocol;


 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLCompareOperation.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.dsml.protocol;


 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLDeleteOperation.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.dsml.protocol;


 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLExtendedOperation.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.dsml.protocol;


 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLModifyDNOperation.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.dsml.protocol;


 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.dsml.protocol;


 opendj-sdk/opends/src/dsml/org/opends/dsml/protocol/NamespacePrefixMapperImpl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.dsml.protocol;


 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/BrowseActionListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.event;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonActionListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.event;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/ButtonEvent.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.event;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateEvent.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.event;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/InstallProgressUpdateListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.event;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/MinimumSizeComponentListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.event;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateEvent.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.event;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/event/UninstallProgressUpdateListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.event;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/DataOptions.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */



 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/FieldName.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallException.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressDescriptor.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallProgressStep.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/LabelFieldDescriptor.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallData.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/UserInstallDataException.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/JnlpProperties.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer.webstart;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartDownloader.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.installer.webstart;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ButtonsPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ConfirmUninstallPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/InstallWelcomePanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ServerSettingsPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/StepsPanel.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.ui;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallException.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.uninstaller;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressDescriptor.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.uninstaller;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallProgressStep.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.uninstaller;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UserUninstallDataException.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.uninstaller;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundTask.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.quicksetup.util;


 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/BackgroundThreadTask.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.quicksetup.util;


 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ExtensionFileFilter.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.util;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.util;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ProgressMessageFormatter.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.util;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/URLWorker.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.util;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserException.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.util;

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/WebBrowserLauncher.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */

package org.opends.quicksetup.util;

 opendj-sdk/opends/src/server/org/opends/server/api/AccessControlHandler.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/AccessControlProvider.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/AccessLogger.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/AccountStatusNotificationHandler.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -35,7 +35,6 @@
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -49,11 +48,6 @@
 */
public abstract class AccountStatusNotificationHandler
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.AccountStatusNotificationHandler";



@@ -86,8 +80,6 @@
   */
  public void finalizeStatusNotificationHandler()
  {
    assert debugEnter(CLASS_NAME,
                      "finalizeStatusNotificationHandler");

    // No action is required by default.
  }
@@ -123,8 +115,6 @@
  public void handleStatusNotification(
                   AccountStatusNotification notification)
  {
    assert debugEnter(CLASS_NAME, "handleStatusNotification",
                      String.valueOf(notification));

    handleStatusNotification(notification.getNotificationType(),
                             notification.getUserDN(),

 opendj-sdk/opends/src/server/org/opends/server/api/AlertGenerator.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -32,7 +32,6 @@

import org.opends.server.types.DN;

import static org.opends.server.loggers.Debug.*;




 opendj-sdk/opends/src/server/org/opends/server/api/AlertHandler.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/ApproximateMatchingRule.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -31,7 +31,6 @@
import org.opends.server.types.ByteString;
import org.opends.server.types.ConditionResult;

import static org.opends.server.loggers.Debug.*;



@@ -43,11 +42,6 @@
public abstract class ApproximateMatchingRule
       extends MatchingRule
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.ApproximateMatchingRule";



@@ -90,9 +84,6 @@
  public ConditionResult valuesMatch(ByteString attributeValue,
                                     ByteString assertionValue)
  {
    assert debugEnter(CLASS_NAME, "valuesMatch",
                      String.valueOf(attributeValue),
                      String.valueOf(assertionValue));

    if (approximatelyMatch(attributeValue, assertionValue))
    {

 opendj-sdk/opends/src/server/org/opends/server/api/AttributeSyntax.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -33,7 +33,6 @@
import org.opends.server.types.ByteString;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -44,11 +43,6 @@
 */
public abstract class AttributeSyntax
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.AttributeSyntax";



@@ -80,7 +74,6 @@
   */
  public void finalizeSyntax()
  {
    assert debugEnter(CLASS_NAME, "finalizeSyntax");

    // No implementation required.
  }
@@ -193,7 +186,6 @@
   */
  public int hashCode()
  {
    assert debugEnter(CLASS_NAME, "hashCode");

    int hashCode = 0;

@@ -223,7 +215,6 @@
   */
  public boolean equals(Object o)
  {
    assert debugEnter(CLASS_NAME, "equals", String.valueOf(o));

    if (o == null)
    {
@@ -254,7 +245,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -272,8 +262,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("( ");
    buffer.append(getOID());

 opendj-sdk/opends/src/server/org/opends/server/api/AttributeValueDecoder.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/Backend.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -56,7 +56,6 @@
import org.opends.server.types.RestoreConfig;
import org.opends.server.types.WritabilityMode;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;

@@ -68,11 +67,6 @@
 */
public abstract class Backend
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.Backend";



@@ -106,7 +100,6 @@
   */
  protected Backend()
  {
    assert debugConstructor(CLASS_NAME);

    backendID           = null;
    parentBackend       = null;
@@ -221,8 +214,6 @@
  public boolean entryExists(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "entryExists",
                      String.valueOf(entryDN));

    Lock lock = null;
    for (int i=0; i < 3; i++)
@@ -411,8 +402,6 @@
   */
  public final boolean supportsControl(String controlOID)
  {
    assert debugEnter(CLASS_NAME, "supportsControl",
                      String.valueOf(controlOID));

    Set<String> supportedControls = getSupportedControls();
    return ((supportedControls != null) &&
@@ -443,8 +432,6 @@
   */
  public final boolean supportsFeature(String featureOID)
  {
    assert debugEnter(CLASS_NAME, "supportsFeature",
                      String.valueOf(featureOID));

    Set<String> supportedFeatures = getSupportedFeatures();
    return ((supportedFeatures != null) &&
@@ -634,7 +621,6 @@
   */
  public String getBackendID()
  {
    assert debugEnter(CLASS_NAME, "getBackendID");

    return backendID;
  }
@@ -648,8 +634,6 @@
   */
  public void setBackendID(String backendID)
  {
    assert debugEnter(CLASS_NAME, "setBackendID",
                      String.valueOf(backendID));

    this.backendID = backendID;
  }
@@ -664,7 +648,6 @@
   */
  public boolean isPrivateBackend()
  {
    assert debugEnter(CLASS_NAME, "isPrivateBackend");

    return isPrivateBackend;
  }
@@ -691,7 +674,6 @@
   */
  public WritabilityMode getWritabilityMode()
  {
    assert debugEnter(CLASS_NAME, "getWritabilityMode");

    return writabilityMode;
  }
@@ -705,8 +687,6 @@
   */
  public void setWritabilityMode(WritabilityMode writabilityMode)
  {
    assert debugEnter(CLASS_NAME, "setWritabilityMode",
                      String.valueOf(writabilityMode));

    if (writabilityMode == null)
    {
@@ -729,7 +709,6 @@
   */
  public BackendMonitor getBackendMonitor()
  {
    assert debugEnter(CLASS_NAME, "getBackendMonitor");

    return backendMonitor;
  }
@@ -743,8 +722,6 @@
   */
  public void setBackendMonitor(BackendMonitor backendMonitor)
  {
    assert debugEnter(CLASS_NAME, "setBackendMonitor",
                      String.valueOf(backendMonitor));

    this.backendMonitor = backendMonitor;
  }
@@ -770,7 +747,6 @@
   */
  public Backend getParentBackend()
  {
    assert debugEnter(CLASS_NAME, "getParentBackend");

    return parentBackend;
  }
@@ -784,8 +760,6 @@
   */
  public void setParentBackend(Backend parentBackend)
  {
    assert debugEnter(CLASS_NAME, "setParentBackend",
                      String.valueOf(parentBackend));

    synchronized (this)
    {
@@ -803,7 +777,6 @@
   */
  public Backend[] getSubordinateBackends()
  {
    assert debugEnter(CLASS_NAME, "getSubordinateBackends");

    return subordinateBackends;
  }
@@ -818,8 +791,6 @@
   */
  public void setSubordinateBackends(Backend[] subordinateBackends)
  {
    assert debugEnter(CLASS_NAME, "setSubordinateBackends",
                      String.valueOf(subordinateBackends));

    synchronized (this)
    {
@@ -843,8 +814,6 @@
   */
  public boolean hasSubSuffix(DN subSuffixDN)
  {
    assert debugEnter(CLASS_NAME, "hasSubSuffix",
                      String.valueOf(subSuffixDN));

    Backend[] subBackends = subordinateBackends;
    for (Backend b : subBackends)
@@ -885,8 +854,6 @@
  public void removeSubSuffix(DN subSuffixDN, DN parentDN)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "removeSubSuffix",
                      String.valueOf(subSuffixDN));

    synchronized (this)
    {
@@ -951,8 +918,6 @@
   */
  public void addSubordinateBackend(Backend subordinateBackend)
  {
    assert debugEnter(CLASS_NAME, "addSubordinateBackend",
                      String.valueOf(subordinateBackend));

    synchronized (this)
    {
@@ -986,8 +951,6 @@
   */
  public void removeSubordinateBackend(Backend subordinateBackend)
  {
    assert debugEnter(CLASS_NAME, "removeSubordinateBackend",
                      String.valueOf(subordinateBackend));

    synchronized (this)
    {
@@ -1032,8 +995,6 @@
   */
  public boolean handlesEntry(DN entryDN)
  {
    assert debugEnter(CLASS_NAME, "handlesEntry",
                      String.valueOf(entryDN));

    DN[] baseDNs = getBaseDNs();
    for (int i=0; i < baseDNs.length; i++)
@@ -1076,8 +1037,6 @@
                                           List<DN> baseDNs,
                                           List<DN> excludeDNs)
  {
    assert debugEnter(CLASS_NAME, "handlesEntry",
                      String.valueOf(entryDN));

    for (DN baseDN : baseDNs)
    {

 opendj-sdk/opends/src/server/org/opends/server/api/CertificateMapper.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -36,7 +36,6 @@
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -48,11 +47,6 @@
 */
public abstract class CertificateMapper
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.CertificateMapper";



@@ -85,7 +79,6 @@
   */
  public void finalizeCertificateMapper()
  {
    assert debugEnter(CLASS_NAME, "finalizeCertificateMapper");

    // No implementation is required by default.
  }

 opendj-sdk/opends/src/server/org/opends/server/api/ClientConnection.java

@@ -61,7 +61,11 @@
import org.opends.server.util.TimeThread;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static
    org.opends.server.loggers.debug.DebugLogger.debugCought;
import static
    org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.CoreMessages.*;
import static org.opends.server.messages.MessageHandler.*;
@@ -75,11 +79,6 @@
 */
public abstract class ClientConnection
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.ClientConnection";



@@ -129,7 +128,6 @@
   */
  protected ClientConnection()
  {
    assert debugConstructor(CLASS_NAME);

    connectTime        = TimeThread.getTime();
    connectTimeString  = TimeThread.getUTCTime();
@@ -195,8 +193,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "finalizeConnectionInternal",
                            e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }

@@ -227,7 +227,6 @@
   */
  public long getConnectTime()
  {
    assert debugEnter(CLASS_NAME, "getConnectTime");

    return connectTime;
  }
@@ -243,7 +242,6 @@
   */
  public String getConnectTimeString()
  {
    assert debugEnter(CLASS_NAME, "getConnectTimeString");

    return connectTimeString;
  }
@@ -462,8 +460,6 @@
  public final boolean sendIntermediateResponse(
                            IntermediateResponse intermediateResponse)
  {
    assert debugEnter(CLASS_NAME, "sendIntermediateResponse",
                      String.valueOf(intermediateResponse));


    // Invoke the intermediate response plugins for the response
@@ -526,11 +522,6 @@
                               boolean sendNotification,
                               int messageID, Object... arguments)
  {
    assert debugEnter(CLASS_NAME, "disconnect",
                      String.valueOf(disconnectReason),
                      String.valueOf(sendNotification),
                      String.valueOf(messageID),
                      String.valueOf(arguments));

    String message = getMessage(messageID, arguments);
    disconnect(disconnectReason, sendNotification, message,
@@ -581,7 +572,6 @@
   */
  public boolean bindInProgress()
  {
    assert debugEnter(CLASS_NAME, "bindInProgress");

    return bindInProgress;
  }
@@ -598,8 +588,6 @@
   */
  public void setBindInProgress(boolean bindInProgress)
  {
    assert debugEnter(CLASS_NAME, "setBindInProgress",
                      String.valueOf(bindInProgress));

    this.bindInProgress = bindInProgress;
  }
@@ -618,7 +606,6 @@
   */
  public boolean mustChangePassword()
  {
    assert debugEnter(CLASS_NAME, "mustChangePassword");

    if (authenticationInfo == null)
    {
@@ -644,8 +631,6 @@
   */
  public void setMustChangePassword(boolean mustChangePassword)
  {
    assert debugEnter(CLASS_NAME, "setMustChangePassword",
                      String.valueOf(mustChangePassword));

    if (authenticationInfo == null)
    {
@@ -709,7 +694,6 @@
  public CopyOnWriteArrayList<PersistentSearch>
              getPersistentSearches()
  {
    assert debugEnter(CLASS_NAME, "getPersistentSearches");

    return persistentSearches;
  }
@@ -728,8 +712,6 @@
  public void registerPersistentSearch(PersistentSearch
                                            persistentSearch)
  {
    assert debugEnter(CLASS_NAME, "registerPersistentSearch",
                      String.valueOf(persistentSearch));

    persistentSearches.add(persistentSearch);
  }
@@ -748,8 +730,6 @@
  public void deregisterPersistentSearch(PersistentSearch
                                              persistentSearch)
  {
    assert debugEnter(CLASS_NAME, "deregisterPersistentSearch",
                      String.valueOf(persistentSearch));

    persistentSearches.remove(persistentSearch);
  }
@@ -806,7 +786,6 @@
   */
  public AuthenticationInfo getAuthenticationInfo()
  {
    assert debugEnter(CLASS_NAME, "getAuthenticationInfo");

    return authenticationInfo;
  }
@@ -825,8 +804,6 @@
  public void setAuthenticationInfo(AuthenticationInfo
                                         authenticationInfo)
  {
    assert debugEnter(CLASS_NAME, "setAuthenticationInfo",
                      String.valueOf(authenticationInfo));

    if (this.authenticationInfo != null)
    {
@@ -916,9 +893,6 @@
   */
  public void updateAuthenticationInfo(Entry oldEntry, Entry newEntry)
  {
    assert debugEnter(CLASS_NAME, "updateAuthenticationInfo",
                      String.valueOf(oldEntry),
                      String.valueOf(newEntry));

    Entry authNEntry = authenticationInfo.getAuthenticationEntry();
    Entry authZEntry = authenticationInfo.getAuthorizationEntry();
@@ -958,7 +932,6 @@
   */
  public void setUnauthenticated()
  {
    assert debugEnter(CLASS_NAME, "setUnauthenticated");

    this.authenticationInfo = new AuthenticationInfo();
    this.sizeLimit          = DirectoryServer.getSizeLimit();
@@ -984,9 +957,6 @@
  public boolean hasPrivilege(Privilege privilege,
                              Operation operation)
  {
    assert debugEnter(CLASS_NAME, "hasPrivilege",
                      String.valueOf(privilege),
                      String.valueOf(operation));

    boolean result = privileges.contains(privilege);
    if (operation == null)
@@ -1035,9 +1005,6 @@
  public boolean hasAllPrivileges(Privilege[] privileges,
                                  Operation operation)
  {
    assert debugEnter(CLASS_NAME, "hasAllPrivileges",
                      String.valueOf(privileges),
                      String.valueOf(operation));

    HashSet<Privilege> privSet = this.privileges;
    boolean result = true;
@@ -1103,8 +1070,6 @@
   */
  private void updatePrivileges(Entry entry, boolean isRoot)
  {
    assert debugEnter(CLASS_NAME, "updatePrivileges",
                      String.valueOf(entry));

    HashSet<Privilege> newPrivileges = new HashSet<Privilege>();
    HashSet<Privilege> removePrivileges = new HashSet<Privilege>();
@@ -1183,7 +1148,6 @@
   */
  public final Object getSASLAuthStateInfo()
  {
    assert debugEnter(CLASS_NAME, "getSASLAuthStateInfo");

    return saslAuthState;
  }
@@ -1200,8 +1164,6 @@
   */
  public final void setSASLAuthStateInfo(Object saslAuthState)
  {
    assert debugEnter(CLASS_NAME, "setSASLAuthStateInfo",
                      String.valueOf(saslAuthState));

    this.saslAuthState = saslAuthState;
  }
@@ -1217,7 +1179,6 @@
   */
  public final int getSizeLimit()
  {
    assert debugEnter(CLASS_NAME, "getSizeLimit");

    return sizeLimit;
  }
@@ -1234,8 +1195,6 @@
   */
  public final void setSizeLimit(int sizeLimit)
  {
    assert debugEnter(CLASS_NAME, "setSizeLimit",
                      String.valueOf(sizeLimit));

    this.sizeLimit = sizeLimit;
  }
@@ -1251,7 +1210,6 @@
   */
  public final int getLookthroughLimit()
  {
    assert debugEnter(CLASS_NAME, "getLookthroughLimit");

    return lookthroughLimit;
  }
@@ -1268,8 +1226,6 @@
   */
  public final void setLookthroughLimit(int lookthroughLimit)
  {
    assert debugEnter(CLASS_NAME, "setLookthroughLimit",
      String.valueOf(lookthroughLimit));

    this.lookthroughLimit = lookthroughLimit;
  }
@@ -1285,7 +1241,6 @@
   */
  public final int getTimeLimit()
  {
    assert debugEnter(CLASS_NAME, "getTimeLimit");

    return timeLimit;
  }
@@ -1302,8 +1257,6 @@
   */
  public final void setTimeLimit(int timeLimit)
  {
    assert debugEnter(CLASS_NAME, "setTimeLimit",
                      String.valueOf(timeLimit));

    this.timeLimit = timeLimit;
  }
@@ -1352,8 +1305,6 @@
  public boolean isMemberOf(Group group, Operation operation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "isMemberOf", String.valueOf(group),
                      String.valueOf(operation));

    if (operation == null)
    {
@@ -1392,8 +1343,6 @@
  public Set<Group> getGroups(Operation operation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getGroups",
                      String.valueOf(operation));


    // FIXME -- This probably isn't the most efficient implementation.
@@ -1456,7 +1405,6 @@
   */
  public DN getKeyManagerProviderDN()
  {
    assert debugEnter(CLASS_NAME, "getKeyManagerProviderDN");

    // In the default implementation, we'll return null.
    return null;
@@ -1479,7 +1427,6 @@
   */
  public DN getTrustManagerProviderDN()
  {
    assert debugEnter(CLASS_NAME, "getTrustManagerProviderDN");

    // In the default implementation, we'll return null.
    return null;
@@ -1512,7 +1459,6 @@
   */
  public final String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);

 opendj-sdk/opends/src/server/org/opends/server/api/ConfigAddListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/ConfigChangeListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/ConfigDeleteListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/ConfigHandler.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/ConfigurableComponent.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -35,7 +35,6 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;

import static org.opends.server.loggers.Debug.*;




 opendj-sdk/opends/src/server/org/opends/server/api/ConnectionHandler.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -35,7 +35,6 @@
import org.opends.server.types.HostPort;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -46,11 +45,6 @@
public abstract class ConnectionHandler
       extends DirectoryThread
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.ConnectionHandler";



@@ -71,7 +65,6 @@
  {
    super(threadName);

    assert debugConstructor(CLASS_NAME, String.valueOf(threadName));
    monitor = null;
  }

@@ -186,7 +179,6 @@
   */
  public ConnectionHandlerMonitor getConnectionHandlerMonitor()
  {
    assert debugEnter(CLASS_NAME, "getConnectionHandlerMonitor");

    return monitor;
  }
@@ -202,8 +194,6 @@
  public void setConnectionHandlerMonitor(
                   ConnectionHandlerMonitor monitor)
  {
    assert debugEnter(CLASS_NAME, "setConnectionHandlerMonitor",
                      String.valueOf(monitor));

    this.monitor = monitor;
  }
@@ -217,7 +207,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);

 opendj-sdk/opends/src/server/org/opends/server/api/ConnectionSecurityProvider.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/DebugLogger.java

File was deleted

 opendj-sdk/opends/src/server/org/opends/server/api/DirectoryServerMBean.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/DirectoryThread.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -31,7 +31,6 @@
import org.opends.server.backends.task.Task;
import org.opends.server.core.DirectoryServer;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;

@@ -58,11 +57,6 @@
public class DirectoryThread
       extends Thread
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.core.DirectoryThread";



@@ -90,7 +84,6 @@
    super (DirectoryServer.getDirectoryThreadGroup(), target,
           threadName);

    assert debugConstructor(CLASS_NAME, String.valueOf(threadName));

    init();
  }
@@ -106,7 +99,6 @@
  {
    super(DirectoryServer.getDirectoryThreadGroup(), threadName);

    assert debugConstructor(CLASS_NAME, String.valueOf(threadName));

    init();
  }
@@ -126,8 +118,6 @@
  {
    super(threadGroup, threadName);

    assert debugConstructor(CLASS_NAME, String.valueOf(threadGroup),
                            String.valueOf(threadName));

    init();
  }
@@ -175,7 +165,6 @@
   */
  public StackTraceElement[] getCreationStackTrace()
  {
    assert debugEnter(CLASS_NAME, "getCreationStackTrace");

    return creationStackTrace;
  }
@@ -192,7 +181,6 @@
   */
  public Thread getParentThread()
  {
    assert debugEnter(CLASS_NAME, "getParentThread");

    return parentThread;
  }
@@ -209,7 +197,6 @@
   */
  public Task getAssociatedTask()
  {
    assert debugEnter(CLASS_NAME, "getAssociatedTask");

    return task;
  }
@@ -225,7 +212,6 @@
   */
  public void setAssociatedTask(Task task)
  {
    assert debugEnter(CLASS_NAME, "setAssociatedTask");

    this.task = task;
  }

 opendj-sdk/opends/src/server/org/opends/server/api/EntryCache.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/EqualityMatchingRule.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -32,7 +32,11 @@
import org.opends.server.types.ByteString;
import org.opends.server.types.ConditionResult;

import static org.opends.server.loggers.Debug.*;
import static
    org.opends.server.loggers.debug.DebugLogger.debugCought;
import static
    org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;



@@ -44,11 +48,6 @@
public abstract class EqualityMatchingRule
       extends MatchingRule
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.EqualityMatchingRule";



@@ -90,9 +89,6 @@
  public ConditionResult valuesMatch(ByteString attributeValue,
                                     ByteString assertionValue)
  {
    assert debugEnter(CLASS_NAME, "valuesMatch",
                      String.valueOf(attributeValue),
                      String.valueOf(assertionValue));

    if (areEqual(attributeValue, assertionValue))
    {
@@ -125,8 +121,6 @@
   */
  public int generateHashCode(AttributeValue attributeValue)
  {
    assert debugEnter(CLASS_NAME, "generateHashCode",
                      String.valueOf(attributeValue));

    try
    {
@@ -134,7 +128,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "generateHashCode", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      try
      {
@@ -142,7 +139,10 @@
      }
      catch (Exception e2)
      {
        assert debugException(CLASS_NAME, "generateHashCode", e2);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e2);
        }

        return 0;
      }

 opendj-sdk/opends/src/server/org/opends/server/api/ErrorLogger.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/ExtendedOperationHandler.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -36,7 +36,6 @@
import org.opends.server.core.ExtendedOperation;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -48,11 +47,6 @@
 */
public abstract class ExtendedOperationHandler
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.ExtendedOperationHandler";



@@ -97,7 +91,6 @@
   */
  public void finalizeExtendedOperationHandler()
  {
    assert debugEnter(CLASS_NAME, "finalizeExtendedOperationHandler");

    // No implementation is required by default.
  }
@@ -125,7 +118,6 @@
   */
  public Set<String> getSupportedControls()
  {
    assert debugEnter(CLASS_NAME, "getSupportedControls");

    return supportedControlOIDs;
  }
@@ -144,8 +136,6 @@
   */
  public final boolean supportsControl(String controlOID)
  {
    assert debugEnter(CLASS_NAME, "supportsControl",
                      String.valueOf(controlOID));

    return getSupportedControls().contains(controlOID);
  }
@@ -161,7 +151,6 @@
   */
  public Set<String> getSupportedFeatures()
  {
    assert debugEnter(CLASS_NAME, "getSupportedFeatures");

    return supportedFeatureOIDs;
  }
@@ -180,8 +169,6 @@
   */
  public final boolean supportsFeature(String featureOID)
  {
    assert debugEnter(CLASS_NAME, "supportsFeature",
                      String.valueOf(featureOID));

    return getSupportedFeatures().contains(featureOID);
  }

 opendj-sdk/opends/src/server/org/opends/server/api/Group.java

@@ -40,7 +40,6 @@
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchScope;

import static org.opends.server.loggers.Debug.*;



@@ -64,11 +63,6 @@
 */
public abstract class Group
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.Group";



@@ -104,7 +98,6 @@
   */
  public void finalizeGroupImplementation()
  {
    assert debugEnter(CLASS_NAME, "finalizeGroupImplementation");

    // No implementation is required by default.
  }
@@ -294,7 +287,6 @@
  public MemberList getMembers()
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getMembers");

    return getMembers(null, null, null);
  }
@@ -395,7 +387,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);

 opendj-sdk/opends/src/server/org/opends/server/api/IdentityMapper.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -34,7 +34,6 @@
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -49,11 +48,6 @@
 */
public abstract class IdentityMapper
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.IdentityMapper";



@@ -86,7 +80,6 @@
   */
  public void finalizeIdentityMapper()
  {
    assert debugEnter(CLASS_NAME, "finalizeIdentityMapper");

    // No implementation is required by default.
  }

 opendj-sdk/opends/src/server/org/opends/server/api/InvokableComponent.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -33,7 +33,6 @@
import org.opends.server.types.DN;
import org.opends.server.types.InvokableMethod;

import static org.opends.server.loggers.Debug.*;




 opendj-sdk/opends/src/server/org/opends/server/api/KeyManagerProvider.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/LogPublisher.java

New file
@@ -0,0 +1,54 @@
/*
 * CDDL HEADER START
 *
 * The contents of this file are subject to the terms of the
 * Common Development and Distribution License, Version 1.0 only
 * (the "License").  You may not use this file except in compliance
 * with the License.
 *
 * You can obtain a copy of the license at
 * trunk/opends/resource/legal-notices/OpenDS.LICENSE
 * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
 * See the License for the specific language governing permissions
 * and limitations under the License.
 *
 * When distributing Covered Code, include this CDDL HEADER in each
 * file and include the License file at
 * trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
 * add the following below this CDDL HEADER, with the fields enclosed
 * by brackets "[]" replaced with your own identifying * information:
 *      Portions Copyright [yyyy] [name of copyright owner]
 *
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

import org.opends.server.loggers.LogRecord;
import org.opends.server.loggers.LogErrorHandler;

/**
 * LogPublishers are reponsible for distributing logged messages from
 * the Logger object to a destination.
 */
public interface LogPublisher
{
  /**
   * Sends the log message to the logging destination. Every
   * LogPublisher must implement the publish method for
   * the generic LogRecord. Specialized LogPublishers should
   * also include an implementation to publish specialized
   * LogRecords (ie. DebugLogRecord).
   *
   * @param record the log record to publish.
   * @param handler the error handler to use when an error occurs.
   */
  public void publish(LogRecord record, LogErrorHandler handler);

  /**
   * Releases any resources and prepare for close.
   */
  public void shutdown();
}

 opendj-sdk/opends/src/server/org/opends/server/api/MatchingRule.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -35,7 +35,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -46,11 +45,6 @@
 */
public abstract class MatchingRule
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.MatchingRule";



@@ -103,7 +97,6 @@
   */
  public String getNameOrOID()
  {
    assert debugEnter(CLASS_NAME, "getNameOrOID");

    String name = getName();
    if ((name == null) || (name.length() == 0))
@@ -151,7 +144,6 @@
   */
  public boolean isObsolete()
  {
    assert debugEnter(CLASS_NAME, "isObsolete");

    return false;
  }
@@ -209,7 +201,6 @@
   */
  public int hashCode()
  {
    assert debugEnter(CLASS_NAME, "hashCode");

    int hashCode = 0;

@@ -237,7 +228,6 @@
   */
  public boolean equals(Object o)
  {
    assert debugEnter(CLASS_NAME, "equals", String.valueOf(o));

    if (o == null)
    {
@@ -268,7 +258,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -286,8 +275,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("( ");
    buffer.append(getOID());

 opendj-sdk/opends/src/server/org/opends/server/api/MonitorProvider.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -37,7 +37,11 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ObjectClass;

import static org.opends.server.loggers.Debug.*;
import static
    org.opends.server.loggers.debug.DebugLogger.debugCought;
import static
    org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.util.ServerConstants.*;


@@ -51,11 +55,6 @@
public abstract class MonitorProvider
       extends DirectoryThread
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.MonitorProvider";



@@ -79,7 +78,6 @@
  {
    super(threadName);

    assert debugConstructor(CLASS_NAME);

    stopRequested = false;
    monitorThread = null;
@@ -120,7 +118,6 @@
   */
  public void finalizeMonitorProvider()
  {
    assert debugEnter(CLASS_NAME, "finalizeMonitorProvider");

    // Signal the monitor thread that it should stop.
    stopRequested = true;
@@ -134,7 +131,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "finalizeMonitorProvider", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }

@@ -164,7 +164,6 @@
   */
  public ObjectClass getMonitorObjectClass()
  {
    assert debugEnter(CLASS_NAME, "getMonitorObjectClass");

    return DirectoryConfig.getObjectClass(OC_EXTENSIBLE_OBJECT_LC,
                                          true);
@@ -218,7 +217,6 @@
   */
  public final void run()
  {
    assert debugEnter(CLASS_NAME, "run");


    monitorThread = Thread.currentThread();

 opendj-sdk/opends/src/server/org/opends/server/api/OrderingMatchingRule.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -34,7 +34,6 @@
import org.opends.server.types.ByteString;
import org.opends.server.types.ConditionResult;

import static org.opends.server.loggers.Debug.*;



@@ -48,11 +47,6 @@
       extends MatchingRule
       implements Comparator<byte[]>, Serializable
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.OrderingMatchingRule";



@@ -113,9 +107,6 @@
  public ConditionResult valuesMatch(ByteString attributeValue,
                                     ByteString assertionValue)
  {
    assert debugEnter(CLASS_NAME, "valuesMatch",
                      String.valueOf(attributeValue),
                      String.valueOf(assertionValue));

    return ConditionResult.UNDEFINED;
  }

 opendj-sdk/opends/src/server/org/opends/server/api/PasswordGenerator.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -35,7 +35,6 @@
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -49,11 +48,6 @@
 */
public abstract class PasswordGenerator
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.PasswordGenerator";



@@ -86,7 +80,6 @@
   */
  public void finalizePasswordGenerator()
  {
    assert debugEnter(CLASS_NAME, "finalizePasswordGenerator");

    // No action is performed by default.
  }

 opendj-sdk/opends/src/server/org/opends/server/api/PasswordStorageScheme.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -34,7 +34,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -46,11 +45,6 @@
 */
public abstract class PasswordStorageScheme
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.PasswordStorageScheme";



@@ -86,7 +80,6 @@
   */
  public void finalizePasswordStorageScheme()
  {
    assert debugEnter(CLASS_NAME, "finalizePasswordStorageScheme");

    // No implementation required by default.
  }
@@ -189,7 +182,6 @@
   */
  public String getAuthPasswordSchemeName()
  {
    assert debugEnter(CLASS_NAME, "getAuthPasswordSchemeName");

    return getStorageSchemeName();
  }

 opendj-sdk/opends/src/server/org/opends/server/api/PasswordValidator.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -37,7 +37,6 @@
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -48,11 +47,6 @@
 */
public abstract class PasswordValidator
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.PasswordValidator";



@@ -86,7 +80,6 @@
   */
  public void finalizePasswordValidator()
  {
    assert debugEnter(CLASS_NAME, "finalizePasswordValidator");


    // No action is required by default.

 opendj-sdk/opends/src/server/org/opends/server/api/ProtocolElement.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/SASLMechanismHandler.java

@@ -33,7 +33,6 @@
import org.opends.server.core.BindOperation;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -44,11 +43,6 @@
 */
public abstract class SASLMechanismHandler
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.SASLMechanismHandler";



@@ -83,7 +77,6 @@
   */
  public void finalizeSASLMechanismHandler()
  {
    assert debugEnter(CLASS_NAME, "finalizeSASLMechanismHandler");

    // No implementation is required by default.
  }

 opendj-sdk/opends/src/server/org/opends/server/api/ServerShutdownListener.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/SubstringMatchingRule.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -34,7 +34,6 @@
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DirectoryException;

import static org.opends.server.loggers.Debug.*;



@@ -46,11 +45,6 @@
public abstract class SubstringMatchingRule
       extends MatchingRule
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.SubstringMatchingRule";



@@ -126,9 +120,6 @@
  public ConditionResult valuesMatch(ByteString attributeValue,
                                     ByteString assertionValue)
  {
    assert debugEnter(CLASS_NAME, "valuesMatch",
                      String.valueOf(attributeValue),
                      String.valueOf(assertionValue));

    return ConditionResult.UNDEFINED;
  }

 opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecification.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/SubtreeSpecificationSet.java

@@ -22,13 +22,10 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

import static org.opends.server.loggers.Debug.debugConstructor;
import static org.opends.server.loggers.Debug.debugEnter;

import java.util.AbstractSet;
import java.util.Collection;
import java.util.HashSet;
@@ -47,9 +44,6 @@
 */
public final class SubtreeSpecificationSet extends
    AbstractSet<SubtreeSpecification> {
  // Fully qualified class name for debugging purposes.
  private static final String CLASS_NAME =
       SubtreeSpecificationSet.class.getName();

  // Underlying implementation is simply a set.
  private HashSet<SubtreeSpecification> pimpl;
@@ -58,7 +52,6 @@
   * Constructs a new empty subtree specification set.
   */
  public SubtreeSpecificationSet() {
    assert debugConstructor(CLASS_NAME);

    this.pimpl = new HashSet<SubtreeSpecification>();
  }
@@ -73,7 +66,6 @@
   */
  public SubtreeSpecificationSet(
      Collection<? extends SubtreeSpecification> c) {
    assert debugConstructor(CLASS_NAME);

    this.pimpl = new HashSet<SubtreeSpecification>(c);
  }
@@ -88,7 +80,6 @@
   *         specified entry.
   */
  public boolean isWithinScope(Entry entry) {
    assert debugEnter(CLASS_NAME, "contains");

    for (SubtreeSpecification subtreeSpecification : pimpl) {
      if (subtreeSpecification.isWithinScope(entry)) {
@@ -104,7 +95,6 @@
   */
  @Override
  public boolean add(SubtreeSpecification e) {
    assert debugEnter(CLASS_NAME, "add");

    return pimpl.add(e);
  }
@@ -114,7 +104,6 @@
   */
  @Override
  public Iterator<SubtreeSpecification> iterator() {
    assert debugEnter(CLASS_NAME, "iterator");

    return pimpl.iterator();
  }
@@ -124,7 +113,6 @@
   */
  @Override
  public boolean contains(Object o) {
    assert debugEnter(CLASS_NAME, "contains");

    return pimpl.contains(o);
  }
@@ -134,7 +122,6 @@
   */
  @Override
  public int size() {
    assert debugEnter(CLASS_NAME, "size");

    return pimpl.size();
  }

 opendj-sdk/opends/src/server/org/opends/server/api/SynchronizationProvider.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -38,7 +38,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.SynchronizationProviderResult;

import static org.opends.server.loggers.Debug.*;



@@ -52,11 +51,6 @@
 */
public abstract class SynchronizationProvider
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.SynchronizationProvider";



@@ -91,7 +85,6 @@
   */
  public void finalizeSynchronizationProvider()
  {
    assert debugEnter(CLASS_NAME, "finalizeSynchronizationProvider");

    // No implementation is required by default.
  }
@@ -120,8 +113,6 @@
              handleConflictResolution(AddOperation addOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "handleConflictResolution",
                      String.valueOf(addOperation));

    // No processing is required by default.
    return new SynchronizationProviderResult(true);
@@ -191,8 +182,6 @@
       handleConflictResolution(DeleteOperation deleteOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "handleConflictResolution",
                      String.valueOf(deleteOperation));

    // No processing is required by default.
    return new SynchronizationProviderResult(true);
@@ -264,8 +253,6 @@
                                            modifyOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "handleConflictResolution",
                      String.valueOf(modifyOperation));

    // No processing is required by default.
    return new SynchronizationProviderResult(true);
@@ -338,8 +325,6 @@
                                            modifyDNOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "handleConflictResolution",
                      String.valueOf(modifyDNOperation));

    // No processing is required by default.
    return new SynchronizationProviderResult(true);

 opendj-sdk/opends/src/server/org/opends/server/api/TrustManagerProvider.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/VirtualAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;


 opendj-sdk/opends/src/server/org/opends/server/api/WorkQueue.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api;

@@ -34,7 +34,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;

import static org.opends.server.loggers.Debug.*;



@@ -50,11 +49,6 @@
 */
public abstract class WorkQueue
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.WorkQueue";



@@ -143,8 +137,6 @@
   */
  public boolean waitUntilIdle(long timeLimit)
  {
    assert debugEnter(CLASS_NAME, "waitUntilIdle",
                      String.valueOf(timeLimit));

    long stopWaitingTime;
    if (timeLimit <= 0)

 opendj-sdk/opends/src/server/org/opends/server/api/package-info.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */



 opendj-sdk/opends/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;

@@ -44,7 +44,6 @@
import org.opends.server.types.SearchResultReference;
import org.opends.server.types.operation.*;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.PluginMessages.*;

@@ -59,11 +58,6 @@
 */
public abstract class DirectoryServerPlugin
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.DirectoryServerPlugin";



@@ -84,7 +78,7 @@
   */
  protected DirectoryServerPlugin()
  {
    assert debugConstructor(CLASS_NAME);

  }


@@ -101,9 +95,6 @@
  public final void initializeInternal(DN pluginDN,
                                       Set<PluginType> pluginTypes)
  {
    assert debugEnter(CLASS_NAME, "initializeInternal",
                      String.valueOf(pluginDN),
                      String.valueOf(pluginTypes));

    this.pluginDN    = pluginDN;
    this.pluginTypes = pluginTypes;
@@ -142,7 +133,6 @@
   */
  public void finalizePlugin()
  {
    assert debugEnter(CLASS_NAME, "finalizePlugin");

    // No implementation is required by default.
  }
@@ -156,7 +146,6 @@
   */
  public final DN getPluginEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getPluginEntryDN");

    return pluginDN;
  }
@@ -171,7 +160,6 @@
   */
  public final Set<PluginType> getPluginTypes()
  {
    assert debugEnter(CLASS_NAME, "getPluginTypes");

    return pluginTypes;
  }
@@ -188,7 +176,6 @@
   */
  public StartupPluginResult doStartup()
  {
    assert debugEnter(CLASS_NAME, "doStartup");

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -209,8 +196,6 @@
   */
  public void doShutdown(String reason)
  {
    assert debugEnter(CLASS_NAME, "doShutdown",
                      String.valueOf(reason));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -234,8 +219,6 @@
  public PostConnectPluginResult doPostConnect(ClientConnection
                                                    clientConnection)
  {
    assert debugEnter(CLASS_NAME, "doPostConnect",
                      String.valueOf(clientConnection));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -267,11 +250,6 @@
                               DisconnectReason disconnectReason,
                               int messageID, String message)
  {
    assert debugEnter(CLASS_NAME, "doPostDisconnect",
                      String.valueOf(clientConnection),
                      String.valueOf(disconnectReason),
                      String.valueOf(messageID),
                      String.valueOf(message));

    int    msgID = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String msg   = getMessage(msgID, String.valueOf(pluginDN),
@@ -296,9 +274,6 @@
  public LDIFPluginResult doLDIFImport(LDIFImportConfig importConfig,
                                       Entry entry)
  {
    assert debugEnter(CLASS_NAME, "doLDIFImport",
                      String.valueOf(importConfig),
                      String.valueOf(entry));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -321,9 +296,6 @@
  public LDIFPluginResult doLDIFExport(LDIFExportConfig exportConfig,
                                       Entry entry)
  {
    assert debugEnter(CLASS_NAME, "doLDIFExport",
                      String.valueOf(exportConfig),
                      String.valueOf(entry));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -345,8 +317,6 @@
  public PreParsePluginResult
       doPreParse(PreParseAbandonOperation abandonOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(abandonOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -369,8 +339,6 @@
  public PostOperationPluginResult
       doPostOperation(PostOperationAbandonOperation abandonOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(abandonOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -392,8 +360,6 @@
  public PreParsePluginResult
       doPreParse(PreParseAddOperation addOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(addOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -417,8 +383,6 @@
  public PreOperationPluginResult
       doPreOperation(PreOperationAddOperation addOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreOperation",
                      String.valueOf(addOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -442,8 +406,6 @@
  public PostOperationPluginResult
       doPostOperation(PostOperationAddOperation addOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(addOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -467,8 +429,6 @@
  public PostResponsePluginResult
       doPostResponse(PostResponseAddOperation addOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostResponse",
                      String.valueOf(addOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -490,8 +450,6 @@
  public PreParsePluginResult
       doPreParse(PreParseBindOperation bindOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(bindOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -513,8 +471,6 @@
  public PreOperationPluginResult
       doPreOperation(PreOperationBindOperation bindOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreOperation",
                      String.valueOf(bindOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -538,8 +494,6 @@
  public PostOperationPluginResult
       doPostOperation(PostOperationBindOperation bindOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(bindOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -563,8 +517,6 @@
  public PostResponsePluginResult
       doPostResponse(PostResponseBindOperation bindOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostResponse",
                      String.valueOf(bindOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -586,8 +538,6 @@
  public PreParsePluginResult
       doPreParse(PreParseCompareOperation compareOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(compareOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -609,8 +559,6 @@
  public PreOperationPluginResult
       doPreOperation(PreOperationCompareOperation compareOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreOperation",
                      String.valueOf(compareOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -634,8 +582,6 @@
  public PostOperationPluginResult
       doPostOperation(PostOperationCompareOperation compareOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(compareOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -660,8 +606,6 @@
  public PostResponsePluginResult
       doPostResponse(PostResponseCompareOperation compareOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostResponse",
                      String.valueOf(compareOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -683,8 +627,6 @@
  public PreParsePluginResult
       doPreParse(PreParseDeleteOperation deleteOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(deleteOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -708,8 +650,6 @@
  public PreOperationPluginResult
       doPreOperation(PreOperationDeleteOperation deleteOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreOperation",
                      String.valueOf(deleteOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -733,8 +673,6 @@
  public PostOperationPluginResult
       doPostOperation(PostOperationDeleteOperation deleteOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(deleteOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -758,8 +696,6 @@
  public PostResponsePluginResult
       doPostResponse(PostResponseDeleteOperation deleteOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostResponse",
                      String.valueOf(deleteOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -781,8 +717,6 @@
  public PreParsePluginResult
       doPreParse(PreParseExtendedOperation extendedOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(extendedOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -805,8 +739,6 @@
  public PreOperationPluginResult
       doPreOperation(PreOperationExtendedOperation extendedOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreOperation",
                      String.valueOf(extendedOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -833,8 +765,6 @@
       doPostOperation(PostOperationExtendedOperation
                            extendedOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(extendedOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -859,8 +789,6 @@
  public PostResponsePluginResult
       doPostResponse(PostResponseExtendedOperation extendedOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostResponse",
                      String.valueOf(extendedOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -883,8 +811,6 @@
  public PreParsePluginResult
       doPreParse(PreParseModifyOperation modifyOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(modifyOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -908,8 +834,6 @@
  public PreOperationPluginResult
       doPreOperation(PreOperationModifyOperation modifyOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreOperation",
                      String.valueOf(modifyOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -933,8 +857,6 @@
  public PostOperationPluginResult
       doPostOperation(PostOperationModifyOperation modifyOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(modifyOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -958,8 +880,6 @@
  public PostResponsePluginResult
       doPostResponse(PostResponseModifyOperation modifyOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostResponse",
                      String.valueOf(modifyOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -981,8 +901,6 @@
  public PreParsePluginResult
       doPreParse(PreParseModifyDNOperation modifyDNOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(modifyDNOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -1007,8 +925,6 @@
  public PreOperationPluginResult
       doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreOperation",
                      String.valueOf(modifyDNOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -1034,8 +950,6 @@
       doPostOperation(PostOperationModifyDNOperation
                            modifyDNOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(modifyDNOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -1060,8 +974,6 @@
  public PostResponsePluginResult
       doPostResponse(PostResponseModifyDNOperation modifyDNOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostResponse",
                      String.valueOf(modifyDNOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -1084,8 +996,6 @@
  public PreParsePluginResult
       doPreParse(PreParseSearchOperation searchOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(searchOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -1107,8 +1017,6 @@
  public PreOperationPluginResult
       doPreOperation(PreOperationSearchOperation searchOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreOperation",
                      String.valueOf(searchOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -1138,9 +1046,6 @@
       processSearchEntry(SearchEntrySearchOperation searchOperation,
                          SearchResultEntry searchEntry)
  {
    assert debugEnter(CLASS_NAME, "processSearchEntry",
                      String.valueOf(searchOperation),
                      String.valueOf(searchEntry));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -1167,9 +1072,6 @@
                                   searchOperation,
                              SearchResultReference searchReference)
  {
    assert debugEnter(CLASS_NAME, "processSearchReference",
                      String.valueOf(searchOperation),
                      String.valueOf(searchReference));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message =
@@ -1194,8 +1096,6 @@
  public PostOperationPluginResult
       doPostOperation(PostOperationSearchOperation searchOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(searchOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -1219,8 +1119,6 @@
  public PostResponsePluginResult
       doPostResponse(PostResponseSearchOperation searchOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostResponse",
                      String.valueOf(searchOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -1242,8 +1140,6 @@
  public PreParsePluginResult
       doPreParse(PreParseUnbindOperation unbindOperation)
  {
    assert debugEnter(CLASS_NAME, "doPreParse",
                      String.valueOf(unbindOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -1266,8 +1162,6 @@
  public PostOperationPluginResult
       doPostOperation(PostOperationUnbindOperation unbindOperation)
  {
    assert debugEnter(CLASS_NAME, "doPostOperation",
                      String.valueOf(unbindOperation));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),
@@ -1290,8 +1184,6 @@
              processIntermediateResponse(
                   IntermediateResponse intermediateResponse)
  {
    assert debugEnter(CLASS_NAME, "processIntermediateResponse",
                      String.valueOf(intermediateResponse));

    int    msgID   = MSGID_PLUGIN_TYPE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(pluginDN),

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/IntermediateResponsePluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,12 +37,6 @@
 */
public class IntermediateResponsePluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin." +
            "IntermediateResponsePluginResult";



@@ -114,11 +107,6 @@
              boolean sendIntermediateResponse,
              boolean continueOperation)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(connectionTerminated),
                            String.valueOf(continuePluginProcessing),
                            String.valueOf(sendIntermediateResponse),
                            String.valueOf(continueOperation));

    this.connectionTerminated     = connectionTerminated;
    this.continuePluginProcessing = continuePluginProcessing;
@@ -138,7 +126,6 @@
   */
  public boolean connectionTerminated()
  {
    assert debugEnter(CLASS_NAME, "connectionTerminated");

    return connectionTerminated;
  }
@@ -155,7 +142,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -172,7 +158,6 @@
   */
  public boolean sendIntermediateResponse()
  {
    assert debugEnter(CLASS_NAME, "sendIntermediateResponse");

    return sendIntermediateResponse;
  }
@@ -188,7 +173,6 @@
   */
  public boolean continueOperation()
  {
    assert debugEnter(CLASS_NAME, "continueOperation");

    return continueOperation;
  }
@@ -204,7 +188,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -222,8 +205,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("IntermediateResponsePluginResult(" +
                  "connectionTerminated=");

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/LDIFPluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class LDIFPluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.LDIFPluginResult";



@@ -92,9 +86,6 @@
  public LDIFPluginResult(boolean continuePluginProcessing,
                          boolean continueEntryProcessing)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(continuePluginProcessing),
                            String.valueOf(continueEntryProcessing));

    this.continuePluginProcessing = continuePluginProcessing;
    this.continueEntryProcessing  = continueEntryProcessing;
@@ -112,7 +103,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -128,7 +118,6 @@
   */
  public boolean continueEntryProcessing()
  {
    assert debugEnter(CLASS_NAME, "continueEntryProcessing");

    return continueEntryProcessing;
  }
@@ -144,7 +133,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -162,8 +150,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("LDIFPluginResult(continuePluginProcessing=");
    buffer.append(continuePluginProcessing);

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PluginType.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;


 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostConnectPluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class PostConnectPluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.PostConnectPluginResult";



@@ -92,9 +86,6 @@
  public PostConnectPluginResult(boolean connectionTerminated,
                                 boolean continuePluginProcessing)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(connectionTerminated),
                            String.valueOf(continuePluginProcessing));

    this.connectionTerminated     = connectionTerminated;
    this.continuePluginProcessing = continuePluginProcessing;
@@ -111,7 +102,6 @@
   */
  public boolean connectionTerminated()
  {
    assert debugEnter(CLASS_NAME, "connectionTerminated");

    return connectionTerminated;
  }
@@ -128,7 +118,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -144,7 +133,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -162,8 +150,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("PostConnectPluginResult(connectionTerminated=");
    buffer.append(connectionTerminated);

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostDisconnectPluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class PostDisconnectPluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.PostDisconnectPluginResult";



@@ -83,8 +77,6 @@
   */
  public PostDisconnectPluginResult(boolean continuePluginProcessing)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(continuePluginProcessing));

    this.continuePluginProcessing = continuePluginProcessing;
  }
@@ -101,7 +93,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -117,7 +108,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -135,8 +125,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("PostDisconnectPluginResult(" +
                  "continuePluginProcessing=");

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostOperationPluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class PostOperationPluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.PostOperationPluginResult";



@@ -93,9 +87,6 @@
  public PostOperationPluginResult(boolean connectionTerminated,
                                   boolean continuePluginProcessing)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(connectionTerminated),
                            String.valueOf(continuePluginProcessing));

    this.connectionTerminated     = connectionTerminated;
    this.continuePluginProcessing = continuePluginProcessing;
@@ -113,7 +104,6 @@
   */
  public boolean connectionTerminated()
  {
    assert debugEnter(CLASS_NAME, "connectionTerminated");

    return connectionTerminated;
  }
@@ -130,7 +120,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -146,7 +135,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -164,8 +152,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("PostOperationPluginResult(connectionTerminated=");
    buffer.append(connectionTerminated);

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PostResponsePluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class PostResponsePluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.PostResponsePluginResult";



@@ -92,9 +86,6 @@
  public PostResponsePluginResult(boolean connectionTerminated,
                                  boolean continuePluginProcessing)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(connectionTerminated),
                            String.valueOf(continuePluginProcessing));

    this.connectionTerminated     = connectionTerminated;
    this.continuePluginProcessing = continuePluginProcessing;
@@ -112,7 +103,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -128,7 +118,6 @@
   */
  public boolean connectionTerminated()
  {
    assert debugEnter(CLASS_NAME, "connectionTerminated");

    return connectionTerminated;
  }
@@ -144,7 +133,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -162,8 +150,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("PostResponsePluginResult(connectionTerminated=");
    buffer.append(connectionTerminated);

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreOperationPluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class PreOperationPluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.PreOperationPluginResult";



@@ -104,10 +98,6 @@
                                  boolean continuePluginProcessing,
                                  boolean sendResponseImmediately)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(connectionTerminated),
                            String.valueOf(continuePluginProcessing),
                            String.valueOf(sendResponseImmediately));

    this.connectionTerminated     = connectionTerminated;
    this.continuePluginProcessing = continuePluginProcessing;
@@ -125,7 +115,6 @@
   */
  public boolean connectionTerminated()
  {
    assert debugEnter(CLASS_NAME, "connectionTerminated");

    return connectionTerminated;
  }
@@ -142,7 +131,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -161,7 +149,6 @@
   */
  public boolean sendResponseImmediately()
  {
    assert debugEnter(CLASS_NAME, "sendResponseImmediately");

    return sendResponseImmediately;
  }
@@ -177,7 +164,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -195,8 +181,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("PostResponsePluginResult(connectionTerminated=");
    buffer.append(connectionTerminated);

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/PreParsePluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class PreParsePluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.PreParsePluginResult";



@@ -104,10 +98,6 @@
                              boolean continuePluginProcessing,
                              boolean sendResponseImmediately)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(connectionTerminated),
                            String.valueOf(continuePluginProcessing),
                            String.valueOf(sendResponseImmediately));

    this.connectionTerminated     = connectionTerminated;
    this.continuePluginProcessing = continuePluginProcessing;
@@ -125,7 +115,6 @@
   */
  public boolean connectionTerminated()
  {
    assert debugEnter(CLASS_NAME, "connectionTerminated");

    return connectionTerminated;
  }
@@ -142,7 +131,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -161,7 +149,6 @@
   */
  public boolean sendResponseImmediately()
  {
    assert debugEnter(CLASS_NAME, "sendResponseImmediately");

    return sendResponseImmediately;
  }
@@ -177,7 +164,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -195,8 +181,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("PostResponsePluginResult(connectionTerminated=");
    buffer.append(connectionTerminated);

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchEntryPluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class SearchEntryPluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.SearchEntryPluginResult";



@@ -108,11 +102,6 @@
                                 boolean sendEntry,
                                 boolean continueSearch)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(connectionTerminated),
                            String.valueOf(continuePluginProcessing),
                            String.valueOf(sendEntry),
                            String.valueOf(continueSearch));

    this.connectionTerminated     = connectionTerminated;
    this.continuePluginProcessing = continuePluginProcessing;
@@ -132,7 +121,6 @@
   */
  public boolean connectionTerminated()
  {
    assert debugEnter(CLASS_NAME, "connectionTerminated");

    return connectionTerminated;
  }
@@ -149,7 +137,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -166,7 +153,6 @@
   */
  public boolean sendEntry()
  {
    assert debugEnter(CLASS_NAME, "sendEntry");

    return sendEntry;
  }
@@ -183,7 +169,6 @@
   */
  public boolean continueSearch()
  {
    assert debugEnter(CLASS_NAME, "continueSearch");

    return continueSearch;
  }
@@ -199,7 +184,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -217,8 +201,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("SearchEntryPluginResult(connectionTerminated=");
    buffer.append(connectionTerminated);

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/SearchReferencePluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -38,11 +37,6 @@
 */
public class SearchReferencePluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.SearchReferencePluginResult";



@@ -109,11 +103,6 @@
                                     boolean sendReference,
                                     boolean continueSearch)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(connectionTerminated),
                            String.valueOf(continuePluginProcessing),
                            String.valueOf(sendReference),
                            String.valueOf(continueSearch));

    this.connectionTerminated     = connectionTerminated;
    this.continuePluginProcessing = continuePluginProcessing;
@@ -133,7 +122,6 @@
   */
  public boolean connectionTerminated()
  {
    assert debugEnter(CLASS_NAME, "connectionTerminated");

    return connectionTerminated;
  }
@@ -150,7 +138,6 @@
   */
  public boolean continuePluginProcessing()
  {
    assert debugEnter(CLASS_NAME, "continuePluginProcessing");

    return continuePluginProcessing;
  }
@@ -167,7 +154,6 @@
   */
  public boolean sendReference()
  {
    assert debugEnter(CLASS_NAME, "sendReference");

    return sendReference;
  }
@@ -184,7 +170,6 @@
   */
  public boolean continueSearch()
  {
    assert debugEnter(CLASS_NAME, "continueSearch");

    return continueSearch;
  }
@@ -200,7 +185,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -218,8 +202,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("SearchReferencePluginResult(" +
                  "connectionTerminated=");

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/StartupPluginResult.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.api.plugin;



import static org.opends.server.loggers.Debug.*;



@@ -39,11 +38,6 @@
 */
public class StartupPluginResult
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.api.plugin.StartupPluginResult";



@@ -107,11 +101,6 @@
                             boolean continueStartup, int errorID,
                             String errorMessage)
  {
    assert debugConstructor(CLASS_NAME,
                            String.valueOf(completedSuccessfully),
                            String.valueOf(continueStartup),
                            String.valueOf(errorID),
                            String.valueOf(errorMessage));

    this.completedSuccessfully = completedSuccessfully;
    this.continueStartup       = continueStartup;
@@ -130,7 +119,6 @@
   */
  public boolean completedSuccessfully()
  {
    assert debugEnter(CLASS_NAME, "completedSuccessfully");

    return completedSuccessfully;
  }
@@ -147,7 +135,6 @@
   */
  public boolean continueStartup()
  {
    assert debugEnter(CLASS_NAME, "continueStartup");

    return continueStartup;
  }
@@ -163,7 +150,6 @@
   */
  public int getErrorID()
  {
    assert debugEnter(CLASS_NAME, "getErrorID");

    return errorID;
  }
@@ -180,7 +166,6 @@
   */
  public String getErrorMessage()
  {
    assert debugEnter(CLASS_NAME, "getErrorMessage");

    return errorMessage;
  }
@@ -194,7 +179,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -212,8 +196,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString",
                      "java.lang.StringBuilder");

    buffer.append("StartupPluginResult(completedSuccessfully=");
    buffer.append(completedSuccessfully);

 opendj-sdk/opends/src/server/org/opends/server/api/plugin/package-info.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */



 opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlHandler.java

@@ -22,11 +22,10 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.authorization;

import static org.opends.server.loggers.Debug.debugEnter;

import org.opends.server.api.AccessControlHandler;
import org.opends.server.core.AddOperation;
@@ -46,16 +45,12 @@
 * requests made by the core directory server.
 */
final class BasicAccessControlHandler extends AccessControlHandler {
  // Fully qualified class name for debugging purposes.
  private static final String CLASS_NAME =
    "org.opends.server.authorization.BasicAccessControlHandler";

  /**
   * {@inheritDoc}
   */
  @Override
  public boolean isAllowed(AddOperation addOperation) {
    assert debugEnter(CLASS_NAME, "isAllowed");

    // TODO: not yet implemented.

@@ -67,7 +62,6 @@
   */
  @Override
  public boolean isAllowed(BindOperation bindOperation) {
    assert debugEnter(CLASS_NAME, "isAllowed");

    // TODO: not yet implemented.

@@ -79,7 +73,6 @@
   */
  @Override
  public boolean isAllowed(CompareOperation compareOperation) {
    assert debugEnter(CLASS_NAME, "isAllowed");

    // TODO: not yet implemented.

@@ -91,7 +84,6 @@
   */
  @Override
  public boolean isAllowed(DeleteOperation deleteOperation) {
    assert debugEnter(CLASS_NAME, "isAllowed");

    // TODO: not yet implemented.

@@ -103,7 +95,6 @@
   */
  @Override
  public boolean isAllowed(ExtendedOperation extendedOperation) {
    assert debugEnter(CLASS_NAME, "isAllowed");

    // TODO: not yet implemented.

@@ -115,7 +106,6 @@
   */
  @Override
  public boolean isAllowed(ModifyOperation modifyOperation) {
    assert debugEnter(CLASS_NAME, "isAllowed");

    // TODO: not yet implemented.

@@ -127,7 +117,6 @@
   */
  @Override
  public boolean isAllowed(ModifyDNOperation modifyDNOperation) {
    assert debugEnter(CLASS_NAME, "isAllowed");

    // TODO: not yet implemented.

@@ -139,7 +128,6 @@
   */
  @Override
  public boolean isAllowed(SearchOperation searchOperation) {
    assert debugEnter(CLASS_NAME, "isAllowed");

    // TODO: not yet implemented.

@@ -152,7 +140,6 @@
  @Override
  public boolean maySend(SearchOperation searchOperation,
      SearchResultEntry searchEntry) {
    assert debugEnter(CLASS_NAME, "maySend");

    // TODO: not yet implemented.

@@ -165,7 +152,6 @@
  @Override
  public SearchResultEntry filterEntry(SearchOperation searchOperation,
      SearchResultEntry searchEntry) {
    assert debugEnter(CLASS_NAME, "filterEntry");

    // TODO: not yet implemented.

@@ -178,7 +164,6 @@
  @Override
  public boolean maySend(SearchOperation searchOperation,
      SearchResultReference searchReference) {
    assert debugEnter(CLASS_NAME, "maySend");

    // TODO: not yet implemented.


 opendj-sdk/opends/src/server/org/opends/server/authorization/BasicAccessControlProvider.java

@@ -22,13 +22,10 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.authorization;

import static org.opends.server.loggers.Debug.debugConstructor;
import static org.opends.server.loggers.Debug.debugEnter;

import org.opends.server.api.AccessControlHandler;
import org.opends.server.api.AccessControlProvider;
import org.opends.server.config.ConfigEntry;
@@ -43,9 +40,6 @@
 */
public class BasicAccessControlProvider implements
    AccessControlProvider {
  // Fully qualified class name for debugging purposes.
  private static final String CLASS_NAME =
    "org.opends.server.authorization.BasicAccessControlProvider";

  /**
   * The single handler instance.
@@ -58,7 +52,6 @@
  public BasicAccessControlProvider() {
    super();

    assert debugConstructor(CLASS_NAME);

    // No implementation required.
  }
@@ -68,7 +61,6 @@
   */
  public void initializeAccessControlHandler(ConfigEntry configEntry)
      throws ConfigException, InitializationException {
    assert debugEnter(CLASS_NAME, "initializeAccessControlHandler");

    // Avoid potential race conditions constructing the handler instance
    // and create it here.
@@ -79,7 +71,6 @@
   * {@inheritDoc}
   */
  public void finalizeAccessControlHandler() {
    assert debugEnter(CLASS_NAME, "finalizeAccessControlHandler");

    // No implementation required.
  }
@@ -88,7 +79,6 @@
   * {@inheritDoc}
   */
  public AccessControlHandler getInstance() {
    assert debugEnter(CLASS_NAME, "getInstance");

    if (instance == null) {
      instance = new BasicAccessControlHandler();

 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciException.java

@@ -26,8 +26,6 @@
 */
package org.opends.server.authorization.dseecompat;

import static org.opends.server.loggers.Debug.debugConstructor;
import static org.opends.server.loggers.Debug.debugEnter;

/**
 * The AciException class defines an exception that may be thrown
@@ -37,11 +35,6 @@
 */
public class AciException extends Exception {

    /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.authorization.dseecompat.AciException";

  /**
   * The serial version identifier required to satisfy the compiler because this
@@ -72,8 +65,6 @@
     */
    public AciException(int messageID, String message) {
      super(message);
      assert debugConstructor(CLASS_NAME, String.valueOf(messageID),
                              String.valueOf(message));
      this.messageID = messageID;
    }

@@ -89,8 +80,6 @@
    public AciException(int messageID, String message, Throwable cause) {
      super(message, cause);

      assert debugConstructor(CLASS_NAME, String.valueOf(message),
                              String.valueOf(cause));

      this.messageID = messageID;
    }
@@ -101,7 +90,6 @@
   * @return  The message ID for this exception.
   */
  public int getMessageID() {
    assert debugEnter(CLASS_NAME, "getMessageID");
    return messageID;
  }
}

 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java

@@ -30,10 +30,20 @@
import org.opends.server.api.AccessControlHandler;
import static org.opends.server.authorization.dseecompat.AciMessages.*;
import org.opends.server.core.*;
import static org.opends.server.loggers.Debug.debugEnter;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
import org.opends.server.types.*;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.Modification;
import org.opends.server.types.ModificationType;
import org.opends.server.types.Privilege;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchResultReference;
import static org.opends.server.util.StaticUtils.toLowerCase;
import java.util.LinkedList;
import java.util.List;
@@ -46,8 +56,6 @@
public class AciHandler extends AccessControlHandler
{

    private static final String CLASS_NAME =
        "org.opends.server.authorization.dseecompat.AciHandler";

    /**
     * ACI_ADD is used to set the container rights for a LDAP add operation.
@@ -571,7 +579,6 @@
     * @return  True if access is allowed.
     */
    public boolean isAllowed(AddOperation operation) {
        assert debugEnter(CLASS_NAME, "isAllowed");
        AciLDAPOperationContainer operationContainer =
                new AciLDAPOperationContainer(operation, ACI_ADD);
        boolean ret=isAllowed(operationContainer,operation);
@@ -593,7 +600,6 @@
     * @return  True if access is allowed.
     */
   public boolean isAllowed(CompareOperation operation) {
       assert debugEnter(CLASS_NAME, "isAllowed");

       AciLDAPOperationContainer operationContainer =
               new AciLDAPOperationContainer(operation, ACI_COMPARE);
@@ -623,7 +629,6 @@
     * @return  True if access is allowed.
     */
   public boolean isAllowed(DeleteOperation operation) {
       assert debugEnter(CLASS_NAME, "isAllowed");
       AciLDAPOperationContainer operationContainer=
               new AciLDAPOperationContainer(operation, ACI_DELETE);
       return isAllowed(operationContainer, operation);
@@ -637,7 +642,6 @@
    */

  public boolean isAllowed(ModifyOperation operation) {
      assert debugEnter(CLASS_NAME, "isAllowed");
      AciLDAPOperationContainer operationContainer=
              new AciLDAPOperationContainer(operation, ACI_NULL);
      return aciCheckMods(operationContainer, operation,
@@ -666,7 +670,6 @@
   */
  public boolean
  maySend(SearchOperation operation, SearchResultEntry entry) {
      assert debugEnter(CLASS_NAME, "maySend");
      AciLDAPOperationContainer operationContainer =
              new AciLDAPOperationContainer(operation,
                                           (ACI_READ | ACI_SEARCH), entry);
@@ -693,7 +696,6 @@
  public SearchResultEntry filterEntry(SearchOperation operation,
                                       SearchResultEntry entry) {

      assert debugEnter(CLASS_NAME, "filterEntry");
      AciLDAPOperationContainer operationContainer =
              new AciLDAPOperationContainer(operation,
                                            (ACI_READ | ACI_SEARCH), entry);
@@ -713,7 +715,6 @@
  @Override
  public boolean maySend(SearchOperation operation,
      SearchResultReference reference) {
    assert debugEnter(CLASS_NAME, "maySend");
    //TODO: Planned to be implemented.
    return true;
  }
@@ -723,7 +724,6 @@
   */
  @Override
  public boolean isAllowed(ModifyDNOperation modifyDNOperation) {
      assert debugEnter(CLASS_NAME, "isAllowed");
      // TODO: Planned to be implemented.
      return true;
  }
@@ -734,7 +734,6 @@
   */
  @Override
  public boolean isAllowed(BindOperation bindOperation) {
      assert debugEnter(CLASS_NAME, "isAllowed");
      //Not planned to be implemented.
      return true;
  }
@@ -744,7 +743,6 @@
   */
  @Override
  public boolean isAllowed(ExtendedOperation extendedOperation) {
      assert debugEnter(CLASS_NAME, "isAllowed");
      //Not planned to be implemented.
      return true;
  }
@@ -754,7 +752,6 @@
   */
  @Override
  public boolean isAllowed(SearchOperation searchOperation) {
      assert debugEnter(CLASS_NAME, "isAllowed");
      //Not planned to be implemented.
      return true;
  }

 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java

@@ -30,15 +30,25 @@
import org.opends.server.api.ChangeNotificationListener;
import org.opends.server.api.BackendInitializationListener;
import org.opends.server.api.Backend;
import org.opends.server.types.*;
import org.opends.server.types.operation.PostResponseAddOperation;
import org.opends.server.types.operation.PostResponseDeleteOperation;
import org.opends.server.types.operation.PostResponseModifyOperation;
import org.opends.server.types.operation.PostResponseModifyDNOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.Error.logError;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DN;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchScope;
import static org.opends.server.authorization.dseecompat.AciMessages.*;
import static org.opends.server.messages.MessageHandler.getMessage;

@@ -52,11 +62,6 @@
public class AciListenerManager
        implements ChangeNotificationListener, BackendInitializationListener {

    /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.core.AciListenerManager";

    private AciList aciList;
       /*
@@ -158,8 +163,10 @@
                    continue;
                }
            } catch (Exception e) {
                assert debugException(CLASS_NAME,
                        "performBackendInitializationProcessing", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
                //TODO log message
                continue;
            }
@@ -174,8 +181,10 @@
            {
                backend.search(internalSearch);
            } catch (Exception e) {
                assert debugException(CLASS_NAME,
                        "performBackendInitializationProcessing", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
                //TODO log message
                continue;
            }

 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciProvider.java

@@ -32,15 +32,12 @@
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.opends.server.types.InitializationException;
import static org.opends.server.loggers.Debug.debugConstructor;

/**
 * This class is the provider class for the dseecompt ACI.
 */
public class AciProvider  implements AccessControlProvider  {

    private static final String CLASS_NAME =
      "org.opends.server.authorization.dseecompat.AciProvider";

    private static AciHandler instance = null;

@@ -49,7 +46,6 @@
     */
    public AciProvider() {
        super();
        assert debugConstructor(CLASS_NAME);
    }



 opendj-sdk/opends/src/server/org/opends/server/authorization/package-info.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */



 opendj-sdk/opends/src/server/org/opends/server/backends/BackupBackend.java

@@ -75,7 +75,9 @@
import org.opends.server.types.SearchScope;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -95,11 +97,6 @@
       extends Backend
       implements ConfigurableComponent
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.BackupBackend";



@@ -135,7 +132,6 @@
  {
    super();

    assert debugConstructor(CLASS_NAME);


    // Perform all initialization in initializeBackend.
@@ -162,8 +158,6 @@
  public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
         throws ConfigException, InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeBackend",
                      String.valueOf(configEntry));


    // Make sure that a configuration entry was provided.  If not, then we will
@@ -186,7 +180,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_BACKUP_CANNOT_DECODE_BACKUP_ROOT_DN;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -223,11 +220,14 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_BACKUP_CANNOT_DETERMINE_BACKUP_DIR_LIST;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
      throw new InitializationException(msgID, message,e);
      throw new InitializationException(msgID, message, e);
    }


@@ -281,7 +281,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
      String message = getMessage(msgID, backupBaseDN.toString(),
@@ -305,7 +308,6 @@
   */
  public void finalizeBackend()
  {
    assert debugEnter(CLASS_NAME, "finalizeBackend");

    DirectoryServer.deregisterConfigurableComponent(this);

@@ -315,7 +317,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "finalizeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }

@@ -328,7 +333,6 @@
   */
  public DN[] getBaseDNs()
  {
    assert debugEnter(CLASS_NAME, "getBaseDNs");

    return baseDNs;
  }
@@ -340,7 +344,6 @@
   */
  public long getEntryCount()
  {
    assert debugEnter(CLASS_NAME, "getEntryCount");

    int numEntries = 1;

@@ -382,7 +385,6 @@
   */
  public boolean isLocal()
  {
    assert debugEnter(CLASS_NAME, "isLocal");

    // For the purposes of this method, this is a local backend.
    return true;
@@ -404,7 +406,6 @@
  public Entry getEntry(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getEntry", String.valueOf(entryDN));


    // If the requested entry was null, then throw an exception.
@@ -470,8 +471,6 @@
  private Entry getBackupDirectoryEntry(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getBackupDirectoryEntry",
                      String.valueOf(entryDN));


    // Make sure that the DN specifies a backup directory.
@@ -497,9 +496,12 @@
    }
    catch (ConfigException ce)
    {
      assert debugException(CLASS_NAME, "getBackupDirectoryEntry", ce);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ce);
      }

      int    msgID   = MSGID_BACKUP_INVALID_BACKUP_DIRECTORY;
      int msgID = MSGID_BACKUP_INVALID_BACKUP_DIRECTORY;
      String message = getMessage(msgID, String.valueOf(entryDN),
                                  ce.getMessage());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
@@ -507,9 +509,12 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "getBackupDirectoryEntry", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY;
      int msgID = MSGID_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, msgID);
@@ -568,7 +573,6 @@
  private Entry getBackupEntry(DN entryDN)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getBackupEntry", String.valueOf(entryDN));


    // First, get the backup ID from the entry DN.
@@ -615,18 +619,24 @@
    }
    catch (ConfigException ce)
    {
      assert debugException(CLASS_NAME, "getBackupEntry", ce);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ce);
      }

      int    msgID   = MSGID_BACKUP_INVALID_BACKUP_DIRECTORY;
      int msgID = MSGID_BACKUP_INVALID_BACKUP_DIRECTORY;
      String message = getMessage(msgID, ce.getMessage());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
                                   msgID);
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "getBackupEntry", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY;
      int msgID = MSGID_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, msgID);
@@ -787,8 +797,6 @@
  public void addEntry(Entry entry, AddOperation addOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addEntry", String.valueOf(entry),
                      String.valueOf(addOperation));

    int    msgID   = MSGID_BACKUP_ADD_NOT_SUPPORTED;
    String message = getMessage(msgID);
@@ -815,8 +823,6 @@
  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "deleteEntry", String.valueOf(entryDN),
                      String.valueOf(deleteOperation));

    int    msgID   = MSGID_BACKUP_DELETE_NOT_SUPPORTED;
    String message = getMessage(msgID);
@@ -843,8 +849,6 @@
  public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "replaceEntry", String.valueOf(entry),
                      String.valueOf(modifyOperation));

    int    msgID   = MSGID_BACKUP_MODIFY_NOT_SUPPORTED;
    String message = getMessage(msgID);
@@ -873,8 +877,6 @@
                                   ModifyDNOperation modifyDNOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "renameEntry", String.valueOf(currentDN),
                      String.valueOf(entry), String.valueOf(modifyDNOperation));

    int    msgID   = MSGID_BACKUP_MODIFY_DN_NOT_SUPPORTED;
    String message = getMessage(msgID);
@@ -897,7 +899,6 @@
  public void search(SearchOperation searchOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "search", String.valueOf(searchOperation));


    // Get the base entry for the search, if possible.  If it doesn't exist,
@@ -947,7 +948,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "search", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            continue;
          }
@@ -986,7 +990,10 @@
                }
                catch (Exception e)
                {
                  assert debugException(CLASS_NAME, "search", e);
                  if (debugEnabled())
                  {
                    debugCought(DebugLogLevel.ERROR, e);
                  }

                  continue;
                }
@@ -1040,7 +1047,10 @@
            }
            catch (Exception e)
            {
              assert debugException(CLASS_NAME, "search", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }

              continue;
            }
@@ -1087,7 +1097,6 @@
   */
  public HashSet<String> getSupportedControls()
  {
    assert debugEnter(CLASS_NAME, "getSupportedControls");

    return supportedControls;
  }
@@ -1101,7 +1110,6 @@
   */
  public HashSet<String> getSupportedFeatures()
  {
    assert debugEnter(CLASS_NAME, "getSupportedFeatures");

    return supportedFeatures;
  }
@@ -1117,7 +1125,6 @@
   */
  public boolean supportsLDIFExport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFExport");

    // We do not support LDIF exports.
    return false;
@@ -1142,7 +1149,6 @@
                         LDIFExportConfig exportConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "exportLDIF", String.valueOf(exportConfig));

    int    msgID   = MSGID_BACKUP_EXPORT_NOT_SUPPORTED;
    String message = getMessage(msgID);
@@ -1161,7 +1167,6 @@
   */
  public boolean supportsLDIFImport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFImport");

    // This backend does not support LDIF imports.
    return false;
@@ -1186,7 +1191,6 @@
                         LDIFImportConfig importConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "importLDIF", String.valueOf(importConfig));


    // This backend does not support LDIF imports.
@@ -1211,7 +1215,6 @@
   */
  public boolean supportsBackup()
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");

    // This backend does not provide a backup/restore mechanism.
    return false;
@@ -1237,7 +1240,6 @@
  public boolean supportsBackup(BackupConfig backupConfig,
                                StringBuilder unsupportedReason)
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");


    // This backend does not provide a backup/restore mechanism.
@@ -1262,7 +1264,6 @@
  public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "createBackup", String.valueOf(backupConfig));


    // This backend does not provide a backup/restore mechanism.
@@ -1290,9 +1291,6 @@
                           String backupID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeBackup",
                      String.valueOf(backupDirectory),
                      String.valueOf(backupID));


    // This backend does not provide a backup/restore mechanism.
@@ -1312,7 +1310,6 @@
   */
  public boolean supportsRestore()
  {
    assert debugEnter(CLASS_NAME, "supportsRestore");


    // This backend does not provide a backup/restore mechanism.
@@ -1338,8 +1335,6 @@
                            RestoreConfig restoreConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "restoreBackup",
                      String.valueOf(restoreConfig));


    // This backend does not provide a backup/restore mechanism.
@@ -1360,7 +1355,6 @@
   */
  public DN getConfigurableComponentEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");

    return configEntryDN;
  }
@@ -1376,7 +1370,6 @@
   */
  public List<ConfigAttribute> getConfigurationAttributes()
  {
    assert debugEnter(CLASS_NAME, "getConfigurationAttributes");


    LinkedList<ConfigAttribute> attrs = new LinkedList<ConfigAttribute>();
@@ -1415,8 +1408,6 @@
  public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
                                            List<String> unacceptableReasons)
  {
    assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration",
                      String.valueOf(configEntry), "java.util.List<String>");


    // We'll accept anything here.  The only configurable attribute is the
@@ -1446,9 +1437,6 @@
  public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
                                                  boolean detailedResults)
  {
    assert debugEnter(CLASS_NAME, "applyNewConfiguration",
                      String.valueOf(configEntry),
                      String.valueOf(detailedResults));


    ResultCode        resultCode          = ResultCode.SUCCESS;
@@ -1481,7 +1469,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_BACKUP_CANNOT_DETERMINE_BACKUP_DIR_LIST;
      messages.add(getMessage(msgID, stackTraceToSingleLineString(e)));

 opendj-sdk/opends/src/server/org/opends/server/backends/MemoryBackend.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends;

@@ -59,7 +59,9 @@
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -100,11 +102,6 @@
public class MemoryBackend
       extends Backend
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.MemoryBackend";



@@ -137,7 +134,6 @@
  {
    super();

    assert debugConstructor(CLASS_NAME);


    // Perform all initialization in initializeBackend.
@@ -152,8 +148,6 @@
                                             DN[] baseDNs)
         throws ConfigException, InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeBackend",
                      String.valueOf(configEntry), String.valueOf(baseDNs));


    // We won't support anything other than exactly one base DN in this
@@ -192,7 +186,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "initializeBackend", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
        String message = getMessage(msgID, dn.toString(),
@@ -220,7 +217,6 @@
   */
  public synchronized void finalizeBackend()
  {
    assert debugEnter(CLASS_NAME, "finalizeBackend");

    clearMemoryBackend();

@@ -232,7 +228,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "finalizeBackend", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -244,7 +243,6 @@
   */
  public DN[] getBaseDNs()
  {
    assert debugEnter(CLASS_NAME, "getBaseDNs");

    return baseDNs;
  }
@@ -256,7 +254,6 @@
   */
  public synchronized long getEntryCount()
  {
    assert debugEnter(CLASS_NAME, "getEntryCount");

    if (entryMap != null)
    {
@@ -273,7 +270,6 @@
   */
  public boolean isLocal()
  {
    assert debugEnter(CLASS_NAME, "isLocal");

    // For the purposes of this method, this is a local backend.
    return true;
@@ -286,7 +282,6 @@
   */
  public synchronized Entry getEntry(DN entryDN)
  {
    assert debugEnter(CLASS_NAME, "getEntry", String.valueOf(entryDN));

    return entryMap.get(entryDN);
  }
@@ -298,7 +293,6 @@
   */
  public synchronized boolean entryExists(DN entryDN)
  {
    assert debugEnter(CLASS_NAME, "entryExists", String.valueOf(entryDN));

    return entryMap.containsKey(entryDN);
  }
@@ -311,8 +305,6 @@
  public synchronized void addEntry(Entry entry, AddOperation addOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addEntry", String.valueOf(entry),
                      String.valueOf(addOperation));


    // See if the target entry already exists.  If so, then fail.
@@ -370,8 +362,6 @@
                                       DeleteOperation deleteOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "deleteEntry", String.valueOf(entryDN),
                      String.valueOf(deleteOperation));


    // Make sure the entry exists.  If not, then throw an exception.
@@ -412,7 +402,10 @@
          {
            // This shouldn't happen, but we want the delete to continue anyway
            // so just ignore it if it does for some reason.
            assert debugException(CLASS_NAME, "deleteEntry", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }
          }
        }
      }
@@ -460,8 +453,6 @@
                                        ModifyOperation modifyOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "replaceEntry", String.valueOf(entry),
                      String.valueOf(modifyOperation));


    // Make sure the entry exists.  If not, then throw an exception.
@@ -487,8 +478,6 @@
                                       ModifyDNOperation modifyDNOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "renameEntry", String.valueOf(currentDN),
                      String.valueOf(entry), String.valueOf(modifyDNOperation));


    // Make sure that the target entry exists.
@@ -572,7 +561,6 @@
  public synchronized void search(SearchOperation searchOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "search", String.valueOf(searchOperation));


    // Get the base DN, scope, and filter for the search.
@@ -618,7 +606,6 @@
   */
  public HashSet<String> getSupportedControls()
  {
    assert debugEnter(CLASS_NAME, "getSupportedControls");

    return supportedControls;
  }
@@ -630,7 +617,6 @@
   */
  public HashSet<String> getSupportedFeatures()
  {
    assert debugEnter(CLASS_NAME, "getSupportedFeatures");

    return supportedFeatures;
  }
@@ -642,7 +628,6 @@
   */
  public boolean supportsLDIFExport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFExport");

    return true;
  }
@@ -656,7 +641,6 @@
                                      LDIFExportConfig exportConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "exportLDIF", String.valueOf(exportConfig));


    // Create the LDIF writer.
@@ -667,9 +651,12 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_MEMORYBACKEND_CANNOT_CREATE_LDIF_WRITER;
      int msgID = MSGID_MEMORYBACKEND_CANNOT_CREATE_LDIF_WRITER;
      String message = getMessage(msgID, String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, msgID, e);
@@ -702,7 +689,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "exportLDIF", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -714,7 +704,6 @@
   */
  public boolean supportsLDIFImport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFImport");

    return true;
  }
@@ -728,7 +717,6 @@
                                      LDIFImportConfig importConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "importLDIF", String.valueOf(importConfig));


    clearMemoryBackend();
@@ -810,7 +798,6 @@
   */
  public boolean supportsBackup()
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");

    // This backend does not provide a backup/restore mechanism.
    return false;
@@ -824,7 +811,6 @@
  public boolean supportsBackup(BackupConfig backupConfig,
                                StringBuilder unsupportedReason)
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");


    // This backend does not provide a backup/restore mechanism.
@@ -839,7 +825,6 @@
  public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "createBackup", String.valueOf(backupConfig));


    int    msgID   = MSGID_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED;
@@ -857,9 +842,6 @@
                           String backupID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeBackup",
                      String.valueOf(backupDirectory),
                      String.valueOf(backupID));


    int    msgID   = MSGID_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED;
@@ -875,7 +857,6 @@
   */
  public boolean supportsRestore()
  {
    assert debugEnter(CLASS_NAME, "supportsRestore");


    // This backend does not provide a backup/restore mechanism.
@@ -891,8 +872,6 @@
                            RestoreConfig restoreConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "restoreBackup",
                      String.valueOf(restoreConfig));


    int    msgID   = MSGID_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED;

 opendj-sdk/opends/src/server/org/opends/server/backends/MonitorBackend.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends;

@@ -72,7 +72,9 @@
import org.opends.server.util.TimeThread;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -90,11 +92,6 @@
       extends Backend
       implements ConfigurableComponent
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.MonitorBackend";



@@ -131,7 +128,6 @@
  {
    super();

    assert debugConstructor(CLASS_NAME);


    // Perform all initialization in initializeBackend.
@@ -158,8 +154,6 @@
  public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
         throws ConfigException, InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeBackend",
                      String.valueOf(configEntry));


    // Make sure that a configuration entry was provided.  If not, then we will
@@ -210,7 +204,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_MONITOR_CANNOT_DECODE_MONITOR_ROOT_DN;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -247,7 +244,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
      String message = getMessage(msgID, baseMonitorDN.toString(),
@@ -271,7 +271,6 @@
   */
  public void finalizeBackend()
  {
    assert debugEnter(CLASS_NAME, "finalizeBackend");

    DirectoryServer.deregisterConfigurableComponent(this);

@@ -281,7 +280,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "finalizeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }

@@ -298,8 +300,6 @@
   */
  private boolean isMonitorConfigAttribute(Attribute attribute)
  {
    assert debugEnter(CLASS_NAME, "isMonitorConfigAttribute",
                      String.valueOf(attribute));

    AttributeType attrType = attribute.getAttributeType();
    if (attrType.hasName(ATTR_COMMON_NAME) ||
@@ -324,7 +324,6 @@
   */
  public DN[] getBaseDNs()
  {
    assert debugEnter(CLASS_NAME, "getBaseDNs");

    return baseDNs;
  }
@@ -336,7 +335,6 @@
   */
  public long getEntryCount()
  {
    assert debugEnter(CLASS_NAME, "getEntryCount");

    return DirectoryServer.getMonitorProviders().size() + 1;
  }
@@ -354,7 +352,6 @@
   */
  public boolean isLocal()
  {
    assert debugEnter(CLASS_NAME, "isLocal");

    // For the purposes of this method, this is a local backend.
    return true;
@@ -376,7 +373,6 @@
  public Entry getEntry(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getEntry", String.valueOf(entryDN));


    // If the requested entry was null, then throw an exception.
@@ -468,7 +464,6 @@
  public boolean entryExists(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "entryExists", String.valueOf(entryDN));

    if (entryDN.equals(baseMonitorDN))
    {
@@ -502,7 +497,6 @@
   */
  public Entry getBaseMonitorEntry()
  {
    assert debugEnter(CLASS_NAME, "getBaseMonitorEntry");


    HashMap<ObjectClass,String> monitorClasses =
@@ -677,8 +671,6 @@
   */
  private Entry getMonitorEntry(DN entryDN, MonitorProvider monitorProvider)
  {
    assert debugEnter(CLASS_NAME, "getMonitorEntry",
                      String.valueOf(monitorProvider));

    HashMap<ObjectClass,String> monitorClasses =
         new LinkedHashMap<ObjectClass,String>(3);
@@ -746,8 +738,6 @@
  private Attribute createAttribute(String name, String lowerName,
                                    String value)
  {
    assert debugEnter(CLASS_NAME, "createAttribute", String.valueOf(name),
                      String.valueOf(lowerName), String.valueOf(value));

    AttributeType type = DirectoryServer.getAttributeType(lowerName);
    if (type == null)
@@ -780,8 +770,6 @@
  public void addEntry(Entry entry, AddOperation addOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addEntry", String.valueOf(entry),
                      String.valueOf(addOperation));

    int    msgID   = MSGID_MONITOR_ADD_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(entry.getDN()));
@@ -808,8 +796,6 @@
  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "deleteEntry", String.valueOf(entryDN),
                      String.valueOf(deleteOperation));

    int    msgID   = MSGID_MONITOR_DELETE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(entryDN));
@@ -836,8 +822,6 @@
  public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "replaceEntry", String.valueOf(entry),
                      String.valueOf(modifyOperation));

    int    msgID   = MSGID_MONITOR_MODIFY_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(entry.getDN()),
@@ -867,8 +851,6 @@
                                   ModifyDNOperation modifyDNOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "renameEntry", String.valueOf(currentDN),
                      String.valueOf(entry), String.valueOf(modifyDNOperation));

    int    msgID   = MSGID_MONITOR_MODIFY_DN_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(currentDN));
@@ -891,7 +873,6 @@
  public void search(SearchOperation searchOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "search", String.valueOf(searchOperation));


    // Get the base entry for the search, if possible.  If it doesn't exist,
@@ -962,7 +943,6 @@
   */
  public HashSet<String> getSupportedControls()
  {
    assert debugEnter(CLASS_NAME, "getSupportedControls");

    return supportedControls;
  }
@@ -976,7 +956,6 @@
   */
  public HashSet<String> getSupportedFeatures()
  {
    assert debugEnter(CLASS_NAME, "getSupportedFeatures");

    return supportedFeatures;
  }
@@ -992,7 +971,6 @@
   */
  public boolean supportsLDIFExport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFExport");

    // We can export all the monitor entries as a point-in-time snapshot.
    return true;
@@ -1017,7 +995,6 @@
                         LDIFExportConfig exportConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "exportLDIF", String.valueOf(exportConfig));


    // Create the LDIF writer.
@@ -1028,7 +1005,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_ROOTDSE_UNABLE_TO_CREATE_LDIF_WRITER;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -1044,7 +1024,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      try
      {
@@ -1052,7 +1035,10 @@
      }
      catch (Exception e2)
      {
        assert debugException(CLASS_NAME, "exportLDIF", e2);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e2);
        }
      }

      int    msgID   = MSGID_MONITOR_UNABLE_TO_EXPORT_BASE;
@@ -1072,7 +1058,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "exportLDIF", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        try
        {
@@ -1080,7 +1069,10 @@
        }
        catch (Exception e2)
        {
          assert debugException(CLASS_NAME, "exportLDIF", e2);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e2);
          }
        }

        int    msgID   = MSGID_MONITOR_UNABLE_TO_EXPORT_PROVIDER_ENTRY;
@@ -1100,7 +1092,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }

@@ -1115,7 +1110,6 @@
   */
  public boolean supportsLDIFImport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFImport");

    // This backend does not support LDIF imports.
    return false;
@@ -1140,7 +1134,6 @@
                         LDIFImportConfig importConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "importLDIF", String.valueOf(importConfig));


    // This backend does not support LDIF imports.
@@ -1165,7 +1158,6 @@
   */
  public boolean supportsBackup()
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");

    // This backend does not provide a backup/restore mechanism.
    return false;
@@ -1191,7 +1183,6 @@
  public boolean supportsBackup(BackupConfig backupConfig,
                                StringBuilder unsupportedReason)
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");


    // This backend does not provide a backup/restore mechanism.
@@ -1216,7 +1207,6 @@
  public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "createBackup", String.valueOf(backupConfig));


    // This backend does not provide a backup/restore mechanism.
@@ -1244,9 +1234,6 @@
                           String backupID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeBackup",
                      String.valueOf(backupDirectory),
                      String.valueOf(backupID));


    // This backend does not provide a backup/restore mechanism.
@@ -1266,7 +1253,6 @@
   */
  public boolean supportsRestore()
  {
    assert debugEnter(CLASS_NAME, "supportsRestore");


    // This backend does not provide a backup/restore mechanism.
@@ -1292,8 +1278,6 @@
                            RestoreConfig restoreConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "restoreBackup",
                      String.valueOf(restoreConfig));


    // This backend does not provide a backup/restore mechanism.
@@ -1314,7 +1298,6 @@
   */
  public DN getConfigurableComponentEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");

    return configEntryDN;
  }
@@ -1330,7 +1313,6 @@
   */
  public List<ConfigAttribute> getConfigurationAttributes()
  {
    assert debugEnter(CLASS_NAME, "getConfigurationAttributes");

    // There are no configurable attributes that will be explicitly advertised.
    return new LinkedList<ConfigAttribute>();
@@ -1355,8 +1337,6 @@
  public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
                                            List<String> unacceptableReasons)
  {
    assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration",
                      String.valueOf(configEntry), "java.util.List<String>");


    // We'll pretty much accept anything here as long as it isn't one of our
@@ -1385,9 +1365,6 @@
  public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
                                                  boolean detailedResults)
  {
    assert debugEnter(CLASS_NAME, "applyNewConfiguration",
                      String.valueOf(configEntry),
                      String.valueOf(detailedResults));


    ResultCode        resultCode          = ResultCode.SUCCESS;

 opendj-sdk/opends/src/server/org/opends/server/backends/RootDSEBackend.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends;

@@ -78,7 +78,9 @@
import org.opends.server.util.LDIFWriter;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
@@ -103,11 +105,6 @@
       extends Backend
       implements ConfigurableComponent
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.RootDSEBackend";



@@ -156,7 +153,6 @@
  {
    super();

    assert debugConstructor(CLASS_NAME);


    // Perform all initialization in initializeBackend.
@@ -183,8 +179,6 @@
  public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
         throws ConfigException, InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeBackend",
                      String.valueOf(configEntry));


    // Make sure that a configuration entry was provided.  If not, then we will
@@ -271,11 +265,14 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_ROOTDSE_SUBORDINATE_BASE_EXCEPTION;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
      throw new InitializationException(msgID, message,e);
      throw new InitializationException(msgID, message, e);
    }


@@ -298,7 +295,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_ROOTDSE_CANNOT_DETERMINE_ALL_USER_ATTRIBUTES;
      String message = getMessage(msgID, ATTR_ROOTDSE_SHOW_ALL_ATTRIBUTES,
@@ -370,7 +370,6 @@
   */
  public void finalizeBackend()
  {
    assert debugEnter(CLASS_NAME, "finalizeBackend");

    DirectoryServer.deregisterConfigurableComponent(this);
  }
@@ -388,8 +387,6 @@
   */
  private boolean isDSEConfigAttribute(Attribute attribute)
  {
    assert debugEnter(CLASS_NAME, "isConfigAttribute",
                      String.valueOf(attribute));

    AttributeType attrType = attribute.getAttributeType();
    if (attrType.hasName(ATTR_ROOT_DSE_SUBORDINATE_BASE_DN.toLowerCase()) ||
@@ -411,7 +408,6 @@
   */
  public DN[] getBaseDNs()
  {
    assert debugEnter(CLASS_NAME, "getBaseDNs");

    return baseDNs;
  }
@@ -423,7 +419,6 @@
   */
  public synchronized long getEntryCount()
  {
    assert debugEnter(CLASS_NAME, "getEntryCount");

    // There is always just a single entry in this backend.
    return 1;
@@ -442,7 +437,6 @@
   */
  public boolean isLocal()
  {
    assert debugEnter(CLASS_NAME, "isLocal");

    // For the purposes of this method, this is a local backend.
    return true;
@@ -464,7 +458,6 @@
  public Entry getEntry(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getEntry", String.valueOf(entryDN));


    // If the requested entry was the root DSE, then create and return it.
@@ -511,7 +504,6 @@
   */
  public Entry getRootDSE()
  {
    assert debugEnter(CLASS_NAME, "getRootDSE");

    HashMap<AttributeType,List<Attribute>> dseUserAttrs =
         new HashMap<AttributeType,List<Attribute>>();
@@ -778,8 +770,6 @@
  private Attribute createAttribute(String name, String lowerName,
                                    String value)
  {
    assert debugEnter(CLASS_NAME, "createAttribute", String.valueOf(name),
                      String.valueOf(lowerName), String.valueOf(value));

    AttributeType type = DirectoryServer.getAttributeType(lowerName);
    if (type == null)
@@ -809,8 +799,6 @@
  private Attribute createDNAttribute(String name, String lowerName,
                                      Collection<DN> values)
  {
    assert debugEnter(CLASS_NAME, "createDNAttribute", String.valueOf(name),
                      String.valueOf(lowerName), String.valueOf(values));

    AttributeType type = DirectoryServer.getAttributeType(lowerName);
    if (type == null)
@@ -844,8 +832,6 @@
  private Attribute createAttribute(String name, String lowerName,
                                    Collection<String> values)
  {
    assert debugEnter(CLASS_NAME, "createAttribute", String.valueOf(name),
                      String.valueOf(lowerName), String.valueOf(values));

    AttributeType type = DirectoryServer.getAttributeType(lowerName);
    if (type == null)
@@ -883,7 +869,6 @@
  public boolean entryExists(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "entryExists", String.valueOf(entryDN));


    // If the specified DN was the null DN, then it exists.
@@ -938,8 +923,6 @@
  public void addEntry(Entry entry, AddOperation addOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addEntry", String.valueOf(entry),
                      String.valueOf(addOperation));

    int    msgID   = MSGID_ROOTDSE_ADD_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(entry.getDN()));
@@ -966,8 +949,6 @@
  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "deleteEntry", String.valueOf(entryDN),
                      String.valueOf(deleteOperation));

    int    msgID   = MSGID_ROOTDSE_DELETE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(entryDN));
@@ -994,8 +975,6 @@
  public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "replaceEntry", String.valueOf(entry),
                      String.valueOf(modifyOperation));

    int    msgID   = MSGID_ROOTDSE_MODIFY_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(entry.getDN()),
@@ -1025,8 +1004,6 @@
                                   ModifyDNOperation modifyDNOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "renameEntry", String.valueOf(currentDN),
                      String.valueOf(entry), String.valueOf(modifyDNOperation));

    int    msgID   = MSGID_ROOTDSE_MODIFY_DN_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(currentDN));
@@ -1053,7 +1030,6 @@
  public void search(SearchOperation searchOperation)
         throws DirectoryException, CancelledOperationException
  {
    assert debugEnter(CLASS_NAME, "search", String.valueOf(searchOperation));

    DN baseDN = searchOperation.getBaseDN();
    if (! baseDN.isNullDN())
@@ -1150,13 +1126,19 @@
        }
        catch (DirectoryException de)
        {
          assert debugException(CLASS_NAME, "search", de);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, de);
          }

          throw de;
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "search", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_ROOTDSE_UNEXPECTED_SEARCH_FAILURE;
          String message = getMessage(msgID, searchOperation.getConnectionID(),
@@ -1190,7 +1172,6 @@
   */
  public HashSet<String> getSupportedControls()
  {
    assert debugEnter(CLASS_NAME, "getSupportedControls");

    return supportedControls;
  }
@@ -1204,7 +1185,6 @@
   */
  public HashSet<String> getSupportedFeatures()
  {
    assert debugEnter(CLASS_NAME, "getSupportedFeatures");

    return supportedFeatures;
  }
@@ -1220,7 +1200,6 @@
   */
  public boolean supportsLDIFExport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFExport");

    // We will only export the DSE entry itself.
    return true;
@@ -1245,7 +1224,6 @@
                         LDIFExportConfig exportConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "exportLDIF", String.valueOf(exportConfig));


    // Create the LDIF writer.
@@ -1256,7 +1234,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_ROOTDSE_UNABLE_TO_CREATE_LDIF_WRITER;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -1273,7 +1254,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_ROOTDSE_UNABLE_TO_EXPORT_DSE;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -1288,7 +1272,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "exportLDIF", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -1304,7 +1291,6 @@
   */
  public boolean supportsLDIFImport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFImport");

    // This backend does not support LDIF imports.
    return false;
@@ -1329,7 +1315,6 @@
                         LDIFImportConfig importConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "importLDIF", String.valueOf(importConfig));


    // This backend does not support LDIF imports.
@@ -1354,7 +1339,6 @@
   */
  public boolean supportsBackup()
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");

    // This backend does not provide a backup/restore mechanism.
    return false;
@@ -1380,7 +1364,6 @@
  public boolean supportsBackup(BackupConfig backupConfig,
                                StringBuilder unsupportedReason)
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");


    // This backend does not provide a backup/restore mechanism.
@@ -1405,7 +1388,6 @@
  public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "createBackup", String.valueOf(backupConfig));


    // This backend does not provide a backup/restore mechanism.
@@ -1433,9 +1415,6 @@
                           String backupID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeBackup",
                      String.valueOf(backupDirectory),
                      String.valueOf(backupID));


    // This backend does not provide a backup/restore mechanism.
@@ -1455,7 +1434,6 @@
   */
  public boolean supportsRestore()
  {
    assert debugEnter(CLASS_NAME, "supportsRestore");


    // This backend does not provide a backup/restore mechanism.
@@ -1481,8 +1459,6 @@
                            RestoreConfig restoreConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "restoreBackup",
                      String.valueOf(restoreConfig));


    // This backend does not provide a backup/restore mechanism.
@@ -1503,7 +1479,6 @@
   */
  public DN getConfigurableComponentEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");

    return configEntryDN;
  }
@@ -1519,7 +1494,6 @@
   */
  public List<ConfigAttribute> getConfigurationAttributes()
  {
    assert debugEnter(CLASS_NAME, "getConfigurationAttributes");

    LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();

@@ -1563,8 +1537,6 @@
  public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
                                            List<String> unacceptableReasons)
  {
    assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration",
                      String.valueOf(configEntry), "java.util.List<String>");


    boolean configIsAcceptable = true;
@@ -1599,7 +1571,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "hasAcceptableConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_ROOTDSE_SUBORDINATE_BASE_EXCEPTION;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -1619,7 +1594,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "hasAcceptableConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_ROOTDSE_CANNOT_DETERMINE_ALL_USER_ATTRIBUTES;
      String message = getMessage(msgID, ATTR_ROOTDSE_SHOW_ALL_ATTRIBUTES,
@@ -1654,9 +1632,6 @@
  public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
                                                  boolean detailedResults)
  {
    assert debugEnter(CLASS_NAME, "applyNewConfiguration",
                      String.valueOf(configEntry),
                      String.valueOf(detailedResults));


    ResultCode        resultCode          = ResultCode.SUCCESS;
@@ -1706,7 +1681,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "applyNewConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_ROOTDSE_SUBORDINATE_BASE_EXCEPTION;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -1737,7 +1715,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "applyNewConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_ROOTDSE_CANNOT_DETERMINE_ALL_USER_ATTRIBUTES;
      String message = getMessage(msgID, ATTR_ROOTDSE_SHOW_ALL_ATTRIBUTES,

 opendj-sdk/opends/src/server/org/opends/server/backends/SchemaBackend.java

@@ -115,10 +115,12 @@
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.LDIFException;
import org.opends.server.util.LDIFWriter;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -136,7 +138,7 @@
       implements ConfigurableComponent, AlertGenerator
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   * The fully-qualified name of this class.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.SchemaBackend";
@@ -237,7 +239,6 @@
  {
    super();

    assert debugConstructor(CLASS_NAME);


    // Perform all initialization in initializeBackend.
@@ -264,8 +265,6 @@
  public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
         throws ConfigException, InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeBackend",
                      String.valueOf(configEntry));


    // Make sure that a configuration entry was provided.  If not, then we will
@@ -368,7 +367,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "applyNewConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_SCHEMA_CANNOT_DETERMINE_SHOW_ALL;
      String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -389,7 +391,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "initializeBackend", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
        String message = getMessage(msgID, baseDNs[i].toString(),
@@ -436,7 +441,6 @@
   */
  public void finalizeBackend()
  {
    assert debugEnter(CLASS_NAME, "finalizeBackend");

    DirectoryServer.deregisterConfigurableComponent(this);

@@ -448,7 +452,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "finalizeBackend", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -466,8 +473,6 @@
   */
  private boolean isSchemaConfigAttribute(Attribute attribute)
  {
    assert debugEnter(CLASS_NAME, "isConfigAttribute",
                      String.valueOf(attribute));

    AttributeType attrType = attribute.getAttributeType();
    if (attrType.hasName(ATTR_SCHEMA_ENTRY_DN.toLowerCase()) ||
@@ -498,7 +503,6 @@
   */
  public DN[] getBaseDNs()
  {
    assert debugEnter(CLASS_NAME, "getBaseDNs");

    return baseDNs;
  }
@@ -510,7 +514,6 @@
   */
  public long getEntryCount()
  {
    assert debugEnter(CLASS_NAME, "getEntryCount");

    // There is always only a single entry in this backend.
    return 1;
@@ -529,7 +532,6 @@
   */
  public boolean isLocal()
  {
    assert debugEnter(CLASS_NAME, "isLocal");

    // For the purposes of this method, this is a local backend.
    return true;
@@ -551,7 +553,6 @@
  public Entry getEntry(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getEntry", String.valueOf(entryDN));


    // If the requested entry was one of the schema entries, then create and
@@ -581,7 +582,6 @@
   */
  public Entry getSchemaEntry(DN entryDN)
  {
    assert debugEnter(CLASS_NAME, "getSchemaEntry", String.valueOf(entryDN));

    LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
         new LinkedHashMap<AttributeType,List<Attribute>>();
@@ -877,7 +877,6 @@
  public boolean entryExists(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "entryExists", String.valueOf(entryDN));


    // The specified DN must be one of the specified schema DNs.
@@ -911,8 +910,6 @@
  public void addEntry(Entry entry, AddOperation addOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addEntry", String.valueOf(entry),
                      String.valueOf(addOperation));

    int    msgID   = MSGID_SCHEMA_ADD_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(entry.getDN()));
@@ -939,8 +936,6 @@
  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "deleteEntry", String.valueOf(entryDN),
                      String.valueOf(deleteOperation));

    int    msgID   = MSGID_SCHEMA_DELETE_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(entryDN));
@@ -967,8 +962,6 @@
  public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "replaceEntry", String.valueOf(entry),
                      String.valueOf(modifyOperation));


    // Make sure that the authenticated user has the necessary UPDATE_SCHEMA
@@ -1044,7 +1037,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1069,7 +1065,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1094,7 +1093,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1119,7 +1121,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DCR;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1144,7 +1149,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DSR;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1169,7 +1177,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_MR_USE;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1215,7 +1226,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1241,7 +1255,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1266,7 +1283,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1291,7 +1311,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DCR;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1317,7 +1340,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DSR;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1343,7 +1369,10 @@
              }
              catch (DirectoryException de)
              {
                assert debugException(CLASS_NAME, "replaceEntry", de);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, de);
                }

                int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_MR_USE;
                String message = getMessage(msgID, v.getStringValue(),
@@ -1404,13 +1433,19 @@
    }
    catch (DirectoryException de)
    {
      assert debugException(CLASS_NAME, "replaceEntry", de);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, de);
      }

      throw de;
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "replaceEntry", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_SCHEMA_MODIFY_CANNOT_WRITE_NEW_SCHEMA;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -1456,9 +1491,6 @@
                                Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addAttributeType",
                      String.valueOf(attributeType), String.valueOf(schema),
                      String.valueOf(modifiedSchemaFiles));


    // First, see if the specified attribute type already exists.  We'll check
@@ -1643,11 +1675,6 @@
                                   Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeAttributeType",
                      String.valueOf(attributeType), String.valueOf(schema),
                      String.valueOf(modifications),
                      String.valueOf(currentPosition),
                      String.valueOf(modifiedSchemaFiles));


    // See if the specified attribute type is actually defined in the server
@@ -1686,7 +1713,10 @@
        }
        catch (DirectoryException de)
        {
          assert debugException(CLASS_NAME, "removeAttributeType", de);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, de);
          }

          int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE;
          String message = getMessage(msgID, v.getStringValue(),
@@ -1818,9 +1848,6 @@
                              Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addObjectClass", String.valueOf(objectClass),
                      String.valueOf(schema),
                      String.valueOf(modifiedSchemaFiles));


    // First, see if the specified objectclass already exists.  We'll check the
@@ -2003,11 +2030,6 @@
                                 Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeObjectClass",
                      String.valueOf(objectClass), String.valueOf(schema),
                      String.valueOf(modifications),
                      String.valueOf(currentPosition),
                      String.valueOf(modifiedSchemaFiles));


    // See if the specified objectclass is actually defined in the server
@@ -2045,7 +2067,10 @@
        }
        catch (DirectoryException de)
        {
          assert debugException(CLASS_NAME, "removeObjectClass", de);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, de);
          }

          int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS;
          String message = getMessage(msgID, v.getStringValue(),
@@ -2142,9 +2167,6 @@
                           Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addNameForm", String.valueOf(nameForm),
                      String.valueOf(schema),
                      String.valueOf(modifiedSchemaFiles));


    // First, see if the specified name form already exists.  We'll check the
@@ -2342,11 +2364,6 @@
                              Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeNameForm",
                      String.valueOf(nameForm), String.valueOf(schema),
                      String.valueOf(modifications),
                      String.valueOf(currentPosition),
                      String.valueOf(modifiedSchemaFiles));


    // See if the specified name form is actually defined in the server schema.
@@ -2384,7 +2401,10 @@
        }
        catch (DirectoryException de)
        {
          assert debugException(CLASS_NAME, "removeNameForm", de);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, de);
          }

          int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM;
          String message = getMessage(msgID, v.getStringValue(),
@@ -2450,9 +2470,6 @@
                                 Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addDITContentRule",
                      String.valueOf(ditContentRule), String.valueOf(schema),
                      String.valueOf(modifiedSchemaFiles));


    // First, see if the specified DIT content rule already exists.  We'll check
@@ -2705,11 +2722,6 @@
                                    Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeDITContentRule",
                      String.valueOf(ditContentRule), String.valueOf(schema),
                      String.valueOf(modifications),
                      String.valueOf(currentPosition),
                      String.valueOf(modifiedSchemaFiles));


    // See if the specified DIT content rule is actually defined in the server
@@ -2761,9 +2773,6 @@
                                   Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addDITStructureRule",
                      String.valueOf(ditStructureRule), String.valueOf(schema),
                      String.valueOf(modifiedSchemaFiles));


    // First, see if the specified DIT structure rule already exists.  We'll
@@ -2934,11 +2943,6 @@
                                      Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeDITStructureRule",
                      String.valueOf(ditStructureRule), String.valueOf(schema),
                      String.valueOf(modifications),
                      String.valueOf(currentPosition),
                      String.valueOf(modifiedSchemaFiles));


    // See if the specified DIT structure rule is actually defined in the server
@@ -2978,7 +2982,10 @@
        }
        catch (DirectoryException de)
        {
          assert debugException(CLASS_NAME, "removeDITStructureRule", de);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, de);
          }

          int msgID = MSGID_SCHEMA_MODIFY_CANNOT_DECODE_DSR;
          String message = getMessage(msgID, v.getStringValue(),
@@ -3047,9 +3054,6 @@
                                  Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addMatchingRuleUse",
                      String.valueOf(matchingRuleUse), String.valueOf(schema),
                      String.valueOf(modifiedSchemaFiles));


    // First, see if the specified matching rule use already exists.  We'll
@@ -3217,11 +3221,6 @@
                                     Set<String> modifiedSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeMatchingRuleUse",
                      String.valueOf(matchingRuleUse), String.valueOf(schema),
                      String.valueOf(modifications),
                      String.valueOf(currentPosition),
                      String.valueOf(modifiedSchemaFiles));


    // See if the specified DIT content rule is actually defined in the server
@@ -3259,7 +3258,6 @@
   */
  private Entry createEmptySchemaEntry()
  {
    assert debugEnter(CLASS_NAME, "createEmptySchemaEntry");

    LinkedHashMap<ObjectClass,String> objectClasses =
         new LinkedHashMap<ObjectClass,String>();
@@ -3324,8 +3322,6 @@
  private File writeTempSchemaFile(Schema schema, String schemaFile)
          throws DirectoryException, IOException, LDIFException
  {
    assert debugEnter(CLASS_NAME, "writeTempSchemaFile", String.valueOf(schema),
                      String.valueOf(schemaFile));


    // Start with an empty schema entry.
@@ -3516,10 +3512,6 @@
                                       int depth)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addAttrTypeToSchemaFile",
                      String.valueOf(schema), String.valueOf(schemaFile),
                      String.valueOf(attributeType), String.valueOf(values),
                      String.valueOf(addedTypes), String.valueOf(depth));

    if (depth > 20)
    {
@@ -3573,10 +3565,6 @@
                                          int depth)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addObjectClassToSchemaFile",
                      String.valueOf(schema), String.valueOf(schemaFile),
                      String.valueOf(objectClass), String.valueOf(values),
                      String.valueOf(addedClasses), String.valueOf(depth));

    if (depth > 20)
    {
@@ -3630,10 +3618,6 @@
                    HashSet<DITStructureRule> addedDSRs, int depth)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addDITStructureRuleToSchemaFile",
                      String.valueOf(schema), String.valueOf(schemaFile),
                      String.valueOf(ditStructureRule), String.valueOf(values),
                      String.valueOf(addedDSRs), String.valueOf(depth));

    if (depth > 20)
    {
@@ -3677,8 +3661,6 @@
  private void installSchemaFiles(HashMap<String,File> tempSchemaFiles)
          throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "installSchemaFiles",
                      String.valueOf(tempSchemaFiles));


    // Create lists that will hold the three types of files we'll be dealing
@@ -3726,7 +3708,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "installSchemaFiles", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      boolean allCleaned = true;
      for (File f : origFileList)
@@ -3743,7 +3728,10 @@
        }
        catch (Exception e2)
        {
          assert debugException(CLASS_NAME, "installSchemaFiles", e2);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e2);
          }

          allCleaned = false;
        }
@@ -3784,7 +3772,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "installSchemaFiles", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      for (File f : installedFileList)
      {
@@ -3797,7 +3788,10 @@
        }
        catch (Exception e2)
        {
          assert debugException(CLASS_NAME, "installSchemaFiles", e2);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e2);
          }
        }
      }

@@ -3819,7 +3813,10 @@
        }
        catch (Exception e2)
        {
          assert debugException(CLASS_NAME, "installSchemaFiles", e2);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e2);
          }

          allRestored = false;
        }
@@ -3861,7 +3858,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "installSchemaFiles", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }

@@ -3876,7 +3876,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "installSchemaFiles", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -3894,8 +3897,6 @@
  private void copyFile(File from, File to)
          throws IOException
  {
    assert debugEnter(CLASS_NAME, "copyFile", String.valueOf(from),
                      String.valueOf(to));

    byte[]           buffer        = new byte[4096];
    FileInputStream  inputStream   = null;
@@ -3922,7 +3923,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "copyFile", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
        }
      }

@@ -3944,8 +3948,6 @@
   */
  private void cleanUpTempSchemaFiles(HashMap<String,File> tempSchemaFiles)
  {
    assert debugEnter(CLASS_NAME, "cleanUpTempSchemaFiles",
                      String.valueOf(tempSchemaFiles));

    if ((tempSchemaFiles == null) || tempSchemaFiles.isEmpty())
    {
@@ -3963,7 +3965,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "cleanUpTempSchemaFiles", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -3989,8 +3994,6 @@
                                   ModifyDNOperation modifyDNOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "renameEntry", String.valueOf(currentDN),
                      String.valueOf(entry), String.valueOf(modifyDNOperation));

    int    msgID   = MSGID_SCHEMA_MODIFY_DN_NOT_SUPPORTED;
    String message = getMessage(msgID, String.valueOf(currentDN));
@@ -4013,7 +4016,6 @@
  public void search(SearchOperation searchOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "search", String.valueOf(searchOperation));

    DN baseDN = searchOperation.getBaseDN();

@@ -4067,7 +4069,6 @@
   */
  public HashSet<String> getSupportedControls()
  {
    assert debugEnter(CLASS_NAME, "getSupportedControls");

    return supportedControls;
  }
@@ -4081,7 +4082,6 @@
   */
  public HashSet<String> getSupportedFeatures()
  {
    assert debugEnter(CLASS_NAME, "getSupportedFeatures");

    return supportedFeatures;
  }
@@ -4097,7 +4097,6 @@
   */
  public boolean supportsLDIFExport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFExport");

    // We will only export the DSE entry itself.
    return true;
@@ -4122,7 +4121,6 @@
                         LDIFExportConfig exportConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "exportLDIF", String.valueOf(exportConfig));


    // Create the LDIF writer.
@@ -4133,7 +4131,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_SCHEMA_UNABLE_TO_CREATE_LDIF_WRITER;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -4150,7 +4151,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_SCHEMA_UNABLE_TO_EXPORT_BASE;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -4165,7 +4169,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "exportLDIF", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -4181,7 +4188,6 @@
   */
  public boolean supportsLDIFImport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFImport");

    // This backend does not support LDIF imports.
    // FIXME -- Should we support them?
@@ -4207,7 +4213,6 @@
                         LDIFImportConfig importConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "importLDIF", String.valueOf(importConfig));


    // This backend does not support LDIF imports.
@@ -4232,7 +4237,6 @@
   */
  public boolean supportsBackup()
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");

    // We do support an online backup mechanism for the schema.
    return true;
@@ -4258,7 +4262,6 @@
  public boolean supportsBackup(BackupConfig backupConfig,
                                StringBuilder unsupportedReason)
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");


    // We should support online backup for the schema in any form.  This
@@ -4286,9 +4289,6 @@
  public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "createBackup",
                      String.valueOf(configEntry),
                      String.valueOf(backupConfig));


    // Get the properties to use for the backup.  We don't care whether or not
@@ -4327,7 +4327,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "createBackup", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_SCHEMA_BACKUP_CANNOT_GET_MAC;
          String message = getMessage(msgID, macAlgorithm,
@@ -4348,7 +4351,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "createBackup", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_SCHEMA_BACKUP_CANNOT_GET_DIGEST;
          String message = getMessage(msgID, digestAlgorithm,
@@ -4398,7 +4404,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_SCHEMA_BACKUP_CANNOT_CREATE_ARCHIVE_FILE;
      String message = getMessage(msgID, String.valueOf(filename),
@@ -4423,7 +4432,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "createBackup", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_SCHEMA_BACKUP_CANNOT_GET_CIPHER;
        String message = getMessage(msgID, cipherAlgorithm,
@@ -4465,7 +4477,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID   = MSGID_SCHEMA_BACKUP_CANNOT_LIST_SCHEMA_FILES;
      message = getMessage(msgID, schemaDirPath,
@@ -4538,7 +4553,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "createBackup", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        try
        {
@@ -4566,7 +4584,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID   = MSGID_SCHEMA_BACKUP_CANNOT_CLOSE_ZIP_STREAM;
      message = getMessage(msgID, filename, backupDirectory.getPath(),
@@ -4607,7 +4628,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_SCHEMA_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR;
      message = getMessage(msgID, backupDirectory.getDescriptorPath(),
@@ -4635,9 +4659,6 @@
                           String backupID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeBackup",
                      String.valueOf(backupDirectory),
                      String.valueOf(backupID));


    // This backend does not provide a backup/restore mechanism.
@@ -4657,7 +4678,6 @@
   */
  public boolean supportsRestore()
  {
    assert debugEnter(CLASS_NAME, "supportsRestore");


    // We will provide a restore, but only for offline operations.
@@ -4683,8 +4703,6 @@
                            RestoreConfig restoreConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "restoreBackup", String.valueOf(configEntry),
                      String.valueOf(restoreConfig));


    // First, make sure that the requested backup exists.
@@ -5195,7 +5213,6 @@
   */
  public DN getConfigurableComponentEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");

    return configEntryDN;
  }
@@ -5211,7 +5228,6 @@
   */
  public List<ConfigAttribute> getConfigurationAttributes()
  {
    assert debugEnter(CLASS_NAME, "getConfigurationAttributes");

    LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();

@@ -5255,8 +5271,6 @@
  public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
                                            List<String> unacceptableReasons)
  {
    assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration",
                      String.valueOf(configEntry), "java.util.List<String>");


    boolean configIsAcceptable = true;
@@ -5274,7 +5288,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_SCHEMA_CANNOT_DETERMINE_BASE_DN;
      String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -5296,7 +5313,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_SCHEMA_CANNOT_DETERMINE_SHOW_ALL;
      String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -5330,9 +5350,6 @@
  public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
                                                  boolean detailedResults)
  {
    assert debugEnter(CLASS_NAME, "applyNewConfiguration",
                      String.valueOf(configEntry),
                      String.valueOf(detailedResults));


    ResultCode        resultCode          = ResultCode.SUCCESS;
@@ -5371,7 +5388,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "applyNewConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_SCHEMA_CANNOT_DETERMINE_BASE_DN;
      messages.add(getMessage(msgID, String.valueOf(configEntryDN),
@@ -5399,7 +5419,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "applyNewConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_SCHEMA_CANNOT_DETERMINE_SHOW_ALL;
      messages.add(getMessage(msgID, String.valueOf(configEntryDN),
@@ -5468,7 +5491,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "applyNewConfiguration", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          msgID = MSGID_SCHEMA_CANNOT_DEREGISTER_BASE_DN;
          messages.add(getMessage(msgID, String.valueOf(dn),
@@ -5491,7 +5517,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "applyNewConfiguration", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          msgID = MSGID_SCHEMA_CANNOT_REGISTER_BASE_DN;
          messages.add(getMessage(msgID, String.valueOf(dn),
@@ -5528,7 +5557,6 @@
   */
  boolean showAllAttributes()
  {
    assert debugEnter(CLASS_NAME, "showAllAttributes");

    return showAllAttributes;
  }
@@ -5545,8 +5573,6 @@
   */
  void setShowAllAttributes(boolean showAllAttributes)
  {
    assert debugEnter(CLASS_NAME, "setShowAllAttributes",
                      String.valueOf(showAllAttributes));

    this.showAllAttributes = showAllAttributes;
  }
@@ -5562,7 +5588,6 @@
   */
  public DN getComponentEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getComponentEntryDN");

    return configEntryDN;
  }
@@ -5578,7 +5603,6 @@
   */
  public String getClassName()
  {
    assert debugEnter(CLASS_NAME, "getClassName");

    return CLASS_NAME;
  }
@@ -5597,7 +5621,6 @@
   */
  public LinkedHashMap<String,String> getAlerts()
  {
    assert debugEnter(CLASS_NAME, "getAlerts");

    LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -49,7 +49,9 @@
import org.opends.server.types.Modification;
import org.opends.server.types.SearchFilter;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;

/**
 * Class representing an attribute index.
@@ -65,11 +67,6 @@
 */
public class AttributeIndex
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.AttributeIndex";


  /**
@@ -513,7 +510,10 @@
    }
    catch (DirectoryException e)
    {
      assert debugException(CLASS_NAME, "evaluateEqualityFilter", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      return new EntryIDSet();
    }
  }
@@ -568,7 +568,10 @@
    }
    catch (DirectoryException e)
    {
      assert debugException(CLASS_NAME, "evaluateGreaterOrEqualFilter", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      return new EntryIDSet();
    }
  }
@@ -605,7 +608,10 @@
    }
    catch (DirectoryException e)
    {
      assert debugException(CLASS_NAME, "evaluateLessOrEqualFilter", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      return new EntryIDSet();
    }
  }
@@ -691,7 +697,10 @@
    }
    catch (DirectoryException e)
    {
      assert debugException(CLASS_NAME, "evaluateSubstringFilter", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      return new EntryIDSet();
    }
  }
@@ -730,7 +739,10 @@
    }
    catch (DirectoryException e)
    {
      assert debugException(CLASS_NAME, "evaluateBoundedRange", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      return new EntryIDSet();
    }
  }

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java

@@ -69,7 +69,9 @@
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.config.ConfigConstants.ATTR_BACKEND_BASE_DN;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.util.ServerConstants.OID_SUBTREE_DELETE_CONTROL;
import static org.opends.server.util.ServerConstants.OID_PAGED_RESULTS_CONTROL;
import static org.opends.server.util.ServerConstants.OID_MANAGE_DSAIT_CONTROL;
@@ -80,11 +82,6 @@
 */
public class BackendImpl extends Backend implements ConfigurableComponent
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.BackendImpl";

  /**
   * The DN of the configuration entry for this backend.
@@ -168,7 +165,6 @@
   */
  private void readerBegin()
  {
    assert debugEnter(CLASS_NAME, "readerBegin");

    threadTotalCount.getAndIncrement();
  }
@@ -180,7 +176,6 @@
   */
  private void readerEnd()
  {
    assert debugEnter(CLASS_NAME, "readerEnd");

    threadTotalCount.getAndDecrement();
  }
@@ -192,7 +187,6 @@
   */
  private void writerBegin()
  {
    assert debugEnter(CLASS_NAME, "writerBegin");

    threadTotalCount.getAndIncrement();
    threadWriteCount.getAndIncrement();
@@ -205,7 +199,6 @@
   */
  private void writerEnd()
  {
    assert debugEnter(CLASS_NAME, "writerEnd");

    threadWriteCount.getAndDecrement();
    threadTotalCount.getAndDecrement();
@@ -220,7 +213,6 @@
   */
  private void waitUntilQuiescent()
  {
    assert debugEnter(CLASS_NAME, "waitUntilQuiescent");

    while (threadTotalCount.get() > 0)
    {
@@ -231,7 +223,10 @@
      }
      catch (InterruptedException e)
      {
        assert debugException(CLASS_NAME, "waitUntilQuiescent", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -246,7 +241,6 @@
   */
  public static String getContainerName(DN dn)
  {
    assert debugEnter(CLASS_NAME, "getContainerName");

    String normStr = dn.toNormalizedString();
    StringBuilder builder = new StringBuilder(normStr.length());
@@ -286,7 +280,6 @@
  public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
       throws ConfigException, InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeBackend");

    configDN = configEntry.getDN();

@@ -302,9 +295,12 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "initializeBackend", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
        int msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
        String message = getMessage(msgID, String.valueOf(dn),
                                    String.valueOf(e));
        throw new InitializationException(msgID, message, e);
@@ -327,7 +323,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      String message = getMessage(MSGID_JEB_OPEN_ENV_FAIL,
                                  e.getMessage());
      throw new InitializationException(MSGID_JEB_OPEN_ENV_FAIL, message, e);
@@ -345,8 +344,10 @@
    }
    catch (DatabaseException databaseException)
    {
      assert debugException(CLASS_NAME, "initializeBackend",
                            databaseException);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, databaseException);
      }
      String message = getMessage(MSGID_JEB_OPEN_DATABASE_FAIL,
                                  databaseException.getMessage());
      throw new InitializationException(MSGID_JEB_OPEN_DATABASE_FAIL, message,
@@ -366,8 +367,10 @@
    }
    catch(DatabaseException databaseException)
    {
      assert debugException(CLASS_NAME, "initializeBackend",
                            databaseException);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, databaseException);
      }
      String message = getMessage(MSGID_JEB_GET_ENTRY_COUNT_FAILED,
                                  databaseException.getMessage());
      throw new InitializationException(MSGID_JEB_GET_ENTRY_COUNT_FAILED,
@@ -397,7 +400,6 @@
   */
  public void finalizeBackend()
  {
    assert debugEnter(CLASS_NAME, "finalizeBackend");

    // Deregister our configurable components.
    // TODO: configurableEnv is always null and will not be deregistered.
@@ -418,7 +420,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "finalizeBackend", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }

@@ -442,7 +447,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "finalizeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      int msgID = MSGID_JEB_DATABASE_EXCEPTION;
      String message = getMessage(msgID, e.getMessage());
      logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
@@ -470,7 +478,6 @@
   */
  public boolean isLocal()
  {
    assert debugEnter(CLASS_NAME, "isLocal");

    return true;
  }
@@ -486,7 +493,6 @@
   */
  public boolean supportsLDIFExport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFExport");

    return true;
  }
@@ -502,7 +508,6 @@
   */
  public boolean supportsLDIFImport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFImport");

    return true;
  }
@@ -522,7 +527,6 @@
   */
  public boolean supportsBackup()
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");

    return true;
  }
@@ -546,7 +550,6 @@
  public boolean supportsBackup(BackupConfig backupConfig,
                                StringBuilder unsupportedReason)
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");

    return true;
  }
@@ -561,7 +564,6 @@
   */
  public boolean supportsRestore()
  {
    assert debugEnter(CLASS_NAME, "supportsRestore");

    return true;
  }
@@ -575,7 +577,6 @@
   */
  public HashSet<String> getSupportedFeatures()
  {
    assert debugEnter(CLASS_NAME, "getSupportedFeatures");

    return new HashSet<String>();  //NYI
  }
@@ -589,7 +590,6 @@
   */
  public HashSet<String> getSupportedControls()
  {
    assert debugEnter(CLASS_NAME, "getSupportedControls");

    return supportedControls;
  }
@@ -603,7 +603,6 @@
   */
  public DN[] getBaseDNs()
  {
    assert debugEnter(CLASS_NAME, "getBaseDNs");

    return config.getBaseDNs();
  }
@@ -615,7 +614,6 @@
   */
  public long getEntryCount()
  {
    assert debugEnter(CLASS_NAME, "getEntryCount");

    if (rootContainer != null)
    {
@@ -625,7 +623,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "getEntryCount", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }

@@ -646,7 +647,6 @@
   */
  public Entry getEntry(DN entryDN) throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getEntry");

    readerBegin();
    try
@@ -659,7 +659,10 @@
      }
      catch (DatabaseException e)
      {
        assert debugException(CLASS_NAME, "getEntry", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
                                    e.getMessage());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -667,7 +670,10 @@
      }
      catch (JebException e)
      {
        assert debugException(CLASS_NAME, "getEntry", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     e.getMessage(),
                                     e.getMessageID());
@@ -698,7 +704,6 @@
  public void addEntry(Entry entry, AddOperation addOperation)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addEntry");

    writerBegin();
    try
@@ -712,7 +717,10 @@
      }
      catch (DatabaseException e)
      {
        assert debugException(CLASS_NAME, "addEntry", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
                                    e.getMessage());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -720,7 +728,10 @@
      }
      catch (JebException e)
      {
        assert debugException(CLASS_NAME, "addEntry", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     e.getMessage(),
                                     e.getMessageID());
@@ -750,7 +761,6 @@
  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "deleteEntry");

    writerBegin();
    try
@@ -762,7 +772,10 @@
      }
      catch (DatabaseException e)
      {
        assert debugException(CLASS_NAME, "deleteEntry", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
                                    e.getMessage());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -770,7 +783,10 @@
      }
      catch (JebException e)
      {
        assert debugException(CLASS_NAME, "deleteEntry", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     e.getMessage(),
                                     e.getMessageID());
@@ -800,7 +816,6 @@
  public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "replaceEntry");

    writerBegin();
    try
@@ -814,7 +829,10 @@
      }
      catch (DatabaseException e)
      {
        assert debugException(CLASS_NAME, "replaceEntry", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
                                    e.getMessage());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -822,7 +840,10 @@
      }
      catch (JebException e)
      {
        assert debugException(CLASS_NAME, "replaceEntry", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     e.getMessage(),
                                     e.getMessageID());
@@ -858,7 +879,6 @@
                          ModifyDNOperation modifyDNOperation)
       throws DirectoryException, CancelledOperationException
  {
    assert debugEnter(CLASS_NAME, "renameEntry");

    writerBegin();
    try
@@ -881,14 +901,20 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "renameEntry", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION, e.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, MSGID_JEB_DATABASE_EXCEPTION);
    }
    catch (JebException e)
    {
      assert debugException(CLASS_NAME, "renameEntry", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessage(),
                                   e.getMessageID());
@@ -913,7 +939,6 @@
  public void search(SearchOperation searchOperation)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "search");

    readerBegin();
    try
@@ -924,7 +949,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "search", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION, e.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, MSGID_JEB_DATABASE_EXCEPTION);
@@ -953,7 +981,6 @@
                         LDIFExportConfig exportConfig)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "exportLDIF");

    // Initialize a config object.
    config = new Config();
@@ -964,7 +991,10 @@
    }
    catch (ConfigException e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessage(),
                                   e.getMessageID());
@@ -991,7 +1021,10 @@
    }
    catch (IOException ioe)
    {
      assert debugException(CLASS_NAME, "exportLDIF", ioe);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ioe);
      }
      int msgID = MSGID_JEB_IO_ERROR;
      String message = getMessage(msgID, ioe.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -999,14 +1032,20 @@
    }
    catch (JebException je)
    {
      assert debugException(CLASS_NAME, "exportLDIF", je);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, je);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   je.getMessage(),
                                   je.getMessageID());
    }
    catch (DatabaseException de)
    {
      assert debugException(CLASS_NAME, "exportLDIF", de);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, de);
      }
      String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
                                  de.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -1014,7 +1053,10 @@
    }
    catch (LDIFException e)
    {
      assert debugException(CLASS_NAME, "exportLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessage(),
                                   e.getMessageID());
@@ -1032,7 +1074,10 @@
        }
        catch (DatabaseException e)
        {
          assert debugException(CLASS_NAME, "exportLDIF", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
        }
      }
    }
@@ -1056,7 +1101,6 @@
                         LDIFImportConfig importConfig)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "importLDIF");

    // Initialize a config object.
    config = new Config();
@@ -1067,7 +1111,10 @@
    }
    catch (ConfigException e)
    {
      assert debugException(CLASS_NAME, "importLDIF", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessage(),
                                   e.getMessageID());
@@ -1080,7 +1127,10 @@
    }
    catch (IOException ioe)
    {
      assert debugException(CLASS_NAME, "importLDIF", ioe);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ioe);
      }
      int msgID = MSGID_JEB_IO_ERROR;
      String message = getMessage(msgID, ioe.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -1088,14 +1138,20 @@
    }
    catch (JebException je)
    {
      assert debugException(CLASS_NAME, "importLDIF", je);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, je);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   je.getMessage(),
                                   je.getMessageID());
    }
    catch (DatabaseException de)
    {
      assert debugException(CLASS_NAME, "importLDIF", de);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, de);
      }
      String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
                                  de.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -1123,7 +1179,6 @@
                            DN[] baseDNs, Entry statEntry)
       throws InitializationException, ConfigException, DirectoryException
  {
    assert debugEnter(CLASS_NAME, "verifyBackend");

    // Initialize a config object.
    config = new Config();
@@ -1150,7 +1205,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "verifyBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
                                  e.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -1158,7 +1216,10 @@
    }
    catch (JebException e)
    {
      assert debugException(CLASS_NAME, "verifyBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessage(),
                                   e.getMessageID());
@@ -1176,7 +1237,10 @@
        }
        catch (DatabaseException e)
        {
          assert debugException(CLASS_NAME, "verifyBackend", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
        }
      }
    }
@@ -1199,7 +1263,6 @@
  public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "createBackup");

    BackupManager backupManager =
         new BackupManager(getBackendID());
@@ -1222,7 +1285,6 @@
  public void removeBackup(BackupDirectory backupDirectory, String backupID)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeBackup");

    BackupManager backupManager =
         new BackupManager(getBackendID());
@@ -1246,7 +1308,6 @@
                            RestoreConfig restoreConfig)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "restoreBackup");

    BackupManager backupManager =
         new BackupManager(getBackendID());
@@ -1264,7 +1325,6 @@
   */
  public DN getConfigurableComponentEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");

    return configDN;
  }
@@ -1280,7 +1340,6 @@
   */
  public List<ConfigAttribute> getConfigurationAttributes()
  {
    assert debugEnter(CLASS_NAME, "getConfigurationAttributes");

    return configAttrs;
  }
@@ -1303,7 +1362,6 @@
  public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
                                            List<String> unacceptableReasons)
  {
    assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration");

    DN[] baseDNs = null;
    boolean acceptable = true;
@@ -1364,7 +1422,6 @@
  public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
                                                  boolean detailedResults)
  {
    assert debugEnter(CLASS_NAME, "applyNewConfiguration");

    ConfigChangeResult ccr;
    ResultCode resultCode = ResultCode.SUCCESS;
@@ -1418,7 +1475,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "applyNewConfiguration", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            resultCode = DirectoryServer.getServerErrorResultCode();

@@ -1457,7 +1517,6 @@
   */
  public RootContainer getRootContainer()
  {
    assert debugEnter(CLASS_NAME, "getRootContainer");
    return rootContainer;
  }


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java

@@ -69,8 +69,9 @@
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;

import static org.opends.server.loggers.Debug.debugEnter;
import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.JebMessages.*;
@@ -113,11 +114,6 @@
   */
  public static final String ZIPENTRY_EMPTY_PLACEHOLDER = "empty.placeholder";

  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.BackupManager";

  /**
   * The backend ID.
@@ -150,7 +146,6 @@
  public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "createBackup", String.valueOf(backupConfig));


    // Parse our backend configuration.
@@ -161,7 +156,10 @@
    }
    catch (ConfigException e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessage(),
                                   e.getMessageID());
@@ -204,7 +202,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "createBackup", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_JEB_BACKUP_CANNOT_GET_MAC;
          String message = getMessage(msgID, macAlgorithm,
@@ -224,7 +225,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "createBackup", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_JEB_BACKUP_CANNOT_GET_DIGEST;
          String message = getMessage(msgID, digestAlgorithm,
@@ -347,7 +351,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_JEB_BACKUP_CANNOT_CREATE_ARCHIVE_FILE;
      String message = getMessage(msgID, String.valueOf(archiveFilename),
@@ -372,7 +379,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "createBackup", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_JEB_BACKUP_CANNOT_GET_CIPHER;
        String message = getMessage(msgID, cipherAlgorithm,
@@ -436,7 +446,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID   = MSGID_JEB_BACKUP_CANNOT_LIST_LOG_FILES;
      message = getMessage(msgID, backendDir.getAbsolutePath(),
@@ -456,7 +469,10 @@
      }
      catch (IOException e)
      {
        assert debugException(CLASS_NAME, "createBackup", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        msgID   = MSGID_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE;
        message = getMessage(msgID, ZIPENTRY_EMPTY_PLACEHOLDER,
            stackTraceToSingleLineString(e));
@@ -535,7 +551,10 @@
          }
          catch (IOException e)
          {
            assert debugException(CLASS_NAME, "createBackup", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }
            msgID   = MSGID_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE;
            message = getMessage(msgID, zipEntryName,
                                 stackTraceToSingleLineString(e));
@@ -564,14 +583,20 @@
          }
          catch (FileNotFoundException e)
          {
            assert debugException(CLASS_NAME, "createBackup", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            // A log file has been deleted by the cleaner since we started.
            deletedFiles = true;
          }
          catch (IOException e)
          {
            assert debugException(CLASS_NAME, "createBackup", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }
            msgID   = MSGID_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE;
            message = getMessage(msgID, logFile.getName(),
                                 stackTraceToSingleLineString(e));
@@ -608,7 +633,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "createBackup", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            msgID   = MSGID_JEB_BACKUP_CANNOT_LIST_LOG_FILES;
            message = getMessage(msgID, backendDir.getAbsolutePath(),
@@ -640,7 +668,10 @@
    }
    catch (DirectoryException e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      try
      {
@@ -656,7 +687,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID   = MSGID_JEB_BACKUP_CANNOT_CLOSE_ZIP_STREAM;
      message = getMessage(msgID, archiveFilename, backupDir.getPath(),
@@ -698,13 +732,17 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_JEB_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR;
      message = getMessage(msgID, backupDir.getDescriptorPath(),
                           stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, msgID, e); }
                                   message, msgID, e);
    }
  }


@@ -735,7 +773,10 @@
    }
    catch (ConfigException e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessage(),
                                   e.getMessageID());
@@ -766,8 +807,11 @@
    }
    catch (IOException e)
    {
      assert debugException(CLASS_NAME, "restoreBackup", e);
      int    msgID   = MSGID_JEB_BACKUP_CANNOT_RESTORE;
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
      String message = getMessage(msgID, backupInfo.getBackupID(),
                                  stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -784,8 +828,11 @@
      }
      catch (IOException e)
      {
        assert debugException(CLASS_NAME, "restoreBackup", e);
        int    msgID   = MSGID_JEB_BACKUP_CANNOT_RESTORE;
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
        String message = getMessage(msgID, dependent.getBackupID(),
                                    stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -800,8 +847,11 @@
    }
    catch (IOException e)
    {
      assert debugException(CLASS_NAME, "restoreBackup", e);
      int    msgID   = MSGID_JEB_BACKUP_CANNOT_RESTORE;
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
      String message = getMessage(msgID, backupInfo.getBackupID(),
                                  stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
@@ -860,7 +910,10 @@
    }
    catch (ConfigException e)
    {
      assert debugException(CLASS_NAME, "removeBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   e.getMessage(),
                                   e.getMessageID());
@@ -872,7 +925,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createBackup", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_JEB_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR;
      String message = getMessage(msgID, backupDir.getDescriptorPath(),
@@ -909,8 +965,6 @@
                              Set<String> includeFiles)
       throws DirectoryException,IOException
  {
    assert debugEnter(CLASS_NAME, "restoreArchive",
                      String.valueOf(restoreConfig));


    BackupDirectory backupDir       = restoreConfig.getBackupDirectory();
@@ -947,7 +1001,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "restoreArchive", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_JEB_BACKUP_CANNOT_GET_MAC;
        String message = getMessage(msgID, macAlgorithm,
@@ -967,7 +1024,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "restoreArchive", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_JEB_BACKUP_CANNOT_GET_DIGEST;
        String message = getMessage(msgID, digestAlgorithm,
@@ -992,7 +1052,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "restoreArchive", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_JEB_BACKUP_CANNOT_GET_CIPHER;
        String message = getMessage(msgID, cipherAlgorithm,
@@ -1333,7 +1396,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "restoreArchive", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_JEB_BACKUP_CANNOT_GET_CIPHER;
        String message = getMessage(msgID, cipherAlgorithm,

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BufferedIndex.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Config.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -69,18 +69,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.io.File;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;

/**
 * This class represents the configuration of a JE backend.
 */
public class Config
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.Config";

  /**
   * The name of the object class which configures
@@ -545,7 +542,10 @@
    }
    catch (DirectoryException e)
    {
      assert debugException(CLASS_NAME, "initializeConfig", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }

    ConcurrentHashMap<DN, ConfigEntry> children = configEntry.getChildren();

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2ID.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -61,7 +61,9 @@
import java.util.Set;

import static org.opends.server.util.ServerConstants.ATTR_REFERRAL_URL;
import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.JebMessages.
     MSGID_JEB_REFERRAL_RESULT_MESSAGE;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -76,11 +78,6 @@
 */
public class DN2URI
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.EntryContainer";

  /**
   * The standard attribute type that is used to specify the set of referral
@@ -475,7 +472,10 @@
      }
      catch (DirectoryException e)
      {
        assert debugException(CLASS_NAME, "throwReferralException", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        // Return the non-LDAP URI as is.
      }

@@ -545,11 +545,17 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "targetEntryReferrals", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
    catch (UnsupportedEncodingException e)
    {
      assert debugException(CLASS_NAME, "targetEntryReferrals", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }

@@ -667,7 +673,10 @@
            }
            catch (DirectoryException e)
            {
              assert debugException(CLASS_NAME, "returnSearchReferences", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              // Return the non-LDAP URI as is.
            }

@@ -689,11 +698,17 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "returnSearchReferences", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
    catch (UnsupportedEncodingException e)
    {
      assert debugException(CLASS_NAME, "returnSearchReferences", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }

    return true;

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DataConfig.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DbPreloadComparator.java

@@ -22,13 +22,15 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

import com.sleepycat.je.Database;
import com.sleepycat.je.DatabaseException;
import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;

import java.util.Comparator;

@@ -38,11 +40,6 @@
 */
public class DbPreloadComparator implements Comparator<Database>
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.EntryContainer";

  /**
   * Calculate the relative priority of a database for preloading.
@@ -70,7 +67,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "TODO", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      return 3;
    }
  }

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java

@@ -38,7 +38,6 @@
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.Operation;
import org.opends.server.core.SearchOperation;
import org.opends.server.loggers.Debug;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.protocols.ldap.LDAPException;
import org.opends.server.controls.PagedResultsControl;
@@ -47,7 +46,7 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.CancelledOperationException;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogCategory;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -69,11 +68,10 @@

import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.JebMessages.*;
import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.types.DebugLogSeverity.VERBOSE;
import static org.opends.server.types.DebugLogCategory.DATABASE_ACCESS;
import static org.opends.server.types.DebugLogCategory.DATABASE_WRITE;
import static org.opends.server.types.DebugLogCategory.DATABASE_READ;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugJEAccess;
import static org.opends.server.loggers.debug.DebugLogger.debugVerbose;
import static org.opends.server.util.ServerConstants.OID_SUBTREE_DELETE_CONTROL;
import static org.opends.server.util.ServerConstants.OID_PAGED_RESULTS_CONTROL;

@@ -84,11 +82,6 @@
 */
public class EntryContainer
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.EntryContainer";

  /**
   * The name of the entry database.
@@ -286,7 +279,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "open", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      close();
      throw e;
    }
@@ -344,7 +340,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "open", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      close();
      throw e;
    }
@@ -399,7 +398,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "openReadOnly", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      close();
      throw e;
    }
@@ -562,7 +564,10 @@
            }
            catch (LDAPException e)
            {
              assert debugException(CLASS_NAME, "search", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                           e.getMessage(), e.getMessageID(), e);
            }
@@ -595,7 +600,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "search", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }

      // The base entry must exist for a successful result.
@@ -769,7 +777,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "search", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }

      // The base entry must exist for a successful result.
@@ -849,7 +860,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "searchNotIndexed", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        int msgID = MSGID_JEB_INVALID_PAGED_RESULTS_COOKIE;
        String str = StaticUtils.bytesToHex(pageRequest.getCookie().value());
        String msg = getMessage(msgID, str);
@@ -987,11 +1001,17 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "searchNotIndexed", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
    catch (JebException e)
    {
      assert debugException(CLASS_NAME, "searchNotIndexed", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }

    if (pageRequest != null)
@@ -1050,7 +1070,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "searchIndexed", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        int msgID = MSGID_JEB_INVALID_PAGED_RESULTS_COOKIE;
        String str = StaticUtils.bytesToHex(pageRequest.getCookie().value());
        String msg = getMessage(msgID, str);
@@ -1115,7 +1138,10 @@
            }
            catch (Exception e)
            {
              assert debugException(CLASS_NAME, "searchIndexed", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              continue;
            }
          }
@@ -1308,8 +1334,10 @@
        {
          throw deadlockException;
        }
        assert debugException(CLASS_NAME, "invokeTransactedOperation",
                              deadlockException);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, deadlockException);
        }
      }
      catch (DatabaseException databaseException)
      {
@@ -2072,7 +2100,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "entryExists", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }

    return id != null;
@@ -3266,7 +3297,10 @@
    }
    catch (DatabaseNotFoundException e)
    {
      assert debugException(CLASS_NAME, "removeContainer", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
    try
    {
@@ -3274,7 +3308,10 @@
    }
    catch (DatabaseNotFoundException e)
    {
      assert debugException(CLASS_NAME, "removeContainer", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
    try
    {
@@ -3282,7 +3319,10 @@
    }
    catch (DatabaseNotFoundException e)
    {
      assert debugException(CLASS_NAME, "removeContainer", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
    try
    {
@@ -3290,7 +3330,10 @@
    }
    catch (DatabaseNotFoundException e)
    {
      assert debugException(CLASS_NAME, "removeContainer", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
    for (AttributeIndex index : attrIndexMap.values())
    {
@@ -3300,7 +3343,10 @@
      }
      catch (DatabaseNotFoundException e)
      {
        assert debugException(CLASS_NAME, "removeContainer", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -3346,7 +3392,10 @@
      }
      catch (DatabaseException e)
      {
        assert debugException(CLASS_NAME, "listDatabases", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -3426,10 +3475,11 @@
      try
      {
        database = env.openDatabase(txn, fullName, dbConfig);
        assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
                                  "openDatabase",
                                  "open db=" + database.getDatabaseName() +
                                  " txnid=" + txn.getId());
        if (debugEnabled())
        {
          debugVerbose("open db=%s txnid=%d", database.getDatabaseName(),
                       txn.getId());
        }
        transactionCommit(txn);
      }
      catch (DatabaseException e)
@@ -3441,10 +3491,10 @@
    else
    {
      database = env.openDatabase(null, fullName, dbConfig);
      assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
                                "openDatabase",
                                "open db=" + database.getDatabaseName() +
                                " txnid=none");
      if (debugEnabled())
      {
        debugVerbose("open db=%s txnid=none", database.getDatabaseName());
      }
    }

    // Insert into the list of database handles.
@@ -3466,8 +3516,10 @@
    Transaction parentTxn = null;
    TransactionConfig txnConfig = null;
    Transaction txn = env.beginTransaction(parentTxn, txnConfig);
    assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
                       "beginTransaction", "begin txnid=" + txn.getId());
    if (debugEnabled())
    {
      debugVerbose("beginTransaction", "begin txnid=" + txn.getId());
    }
    return txn;
  }

@@ -3484,9 +3536,10 @@
    if (txn != null)
    {
      txn.commit();
      assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
                                "transactionCommit", "commit txnid=" +
                                                     txn.getId());
      if (debugEnabled())
      {
        debugVerbose("commit txnid=%d", txn.getId());
      }
    }
  }

@@ -3503,89 +3556,11 @@
    if (txn != null)
    {
      txn.abort();
      assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
                                "transactionAbort", "abort txnid=" +
                                                    txn.getId());
    }
  }

  /**
   * Debug log a read or write access to the database.
   * @param operation The operation label: "read", "put", "insert".
   * @param category The log category for raw data value logging
   * @param status The JE return status code of the operation.
   * @param database The JE database handle operated on.
   * @param txn The JE transaction handle used in the operation.
   * @param key The database key operated on.
   * @param data The database value read or written.
   * @return true so that the method can be used in an assertion
   * @throws DatabaseException If an error occurs while retrieving information
   * about the JE objects provided to the method.
   */
  private static boolean debugAccess(String operation,
                             DebugLogCategory category,
                             OperationStatus status,
                             Database database,
                             Transaction txn,
                             DatabaseEntry key, DatabaseEntry data)
       throws DatabaseException
  {
    // Build the string that is common to category DATABASE_ACCESS and
    // DATABASE_READ/DATABASE_WRITE
    StringBuilder builder = new StringBuilder();
    builder.append(operation);
    if(status != null)
    {
      if (status == OperationStatus.SUCCESS)
      if (debugEnabled())
      {
        builder.append(" (ok)");
      }
      else
      {
        builder.append(" (");
        builder.append(status.toString());
        builder.append(")");
        debugVerbose("abort txnid=%d", txn.getId());
      }
    }
    builder.append(" db=");
    builder.append(database.getDatabaseName());
    if (txn != null)
    {
      builder.append(" txnid=");
      builder.append(txn.getId());
    }
    else
    {
      builder.append(" txnid=none");
    }
    Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
                       "debugAccess", builder.toString());

    // If the operation was successful we log the same common information
    // plus the key and data under category DATABASE_READ or DATABASE_WRITE
    if (status == OperationStatus.SUCCESS)
    {
      builder.append(" key:");
      builder.append(ServerConstants.EOL);
      StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 0);
      if (data != null)
      {
        builder.append("data(len=");
        builder.append(data.getSize());
        builder.append("):");
        builder.append(ServerConstants.EOL);
        StaticUtils.byteArrayToHexPlusAscii(builder, data.getData(), 0);
      }
      Debug.debugMessage(category, VERBOSE, CLASS_NAME,
                         "debugAccess", builder.toString());
/*
      if (category == DATABASE_WRITE)
      {
        System.out.println(builder.toString());
      }
*/
    }
    return true;
  }

  /**
@@ -3603,8 +3578,10 @@
       throws DatabaseException
  {
    OperationStatus status = database.putNoOverwrite(txn, key, data);
    assert debugAccess("insert", DATABASE_WRITE,
                       status, database, txn, key, data);
    if (debugEnabled())
    {
      debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key, data);
    }
    return status;
  }

@@ -3624,8 +3601,11 @@
       throws DatabaseException
  {
    OperationStatus status = cursor.putNoOverwrite(key, data);
    assert debugAccess("cursorInsert", DATABASE_WRITE,
                       status, cursor.getDatabase(), null, key, data);
    if (debugEnabled())
    {
      debugJEAccess(DebugLogLevel.VERBOSE, status,
                    cursor.getDatabase(), null, key, data);
    }
    return status;
  }

@@ -3644,8 +3624,10 @@
       throws DatabaseException
  {
    OperationStatus status = database.put(txn, key, data);
    assert debugAccess("put", DATABASE_WRITE,
                       status, database, txn, key, data);
    if (debugEnabled())
    {
      debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key, data);
    }
    return status;
  }

@@ -3665,8 +3647,11 @@
       throws DatabaseException
  {
    OperationStatus status = cursor.put(key, data);
    assert debugAccess("cursorPut", DATABASE_WRITE,
                       status, cursor.getDatabase(), null, key, data);
    if (debugEnabled())
    {
      debugJEAccess(DebugLogLevel.VERBOSE, status,
                    cursor.getDatabase(), null, key, data);
    }
    return status;
  }

@@ -3688,8 +3673,10 @@
       throws DatabaseException
  {
    OperationStatus status = database.get(txn, key, data, lockMode);
    assert debugAccess("read", DATABASE_READ,
                       status, database, txn, key, data);
    if (debugEnabled())
    {
      debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key, data);
    }
    return status;
  }

@@ -3711,8 +3698,11 @@
       throws DatabaseException
  {
    OperationStatus status = cursor.getSearchKey(key, data, lockMode);
    assert debugAccess("cursorRead", DATABASE_READ,
                       status, cursor.getDatabase(), null, key, data);
    if (debugEnabled())
    {
      debugJEAccess(DebugLogLevel.VERBOSE, status,
                    cursor.getDatabase(), null, key, data);
    }
    return status;
  }

@@ -3730,8 +3720,10 @@
       throws DatabaseException
  {
    OperationStatus status = database.delete(txn, key);
    assert debugAccess("delete", DATABASE_WRITE,
                       status, database, txn, key, null);
    if (debugEnabled())
    {
      debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key, null);
    }
    return status;
  }

@@ -3745,8 +3737,11 @@
  public static long count(Database database) throws DatabaseException
  {
    long count = database.count();
    assert debugAccess("count", DATABASE_READ, null, database,
        null, null, null);
    if (debugEnabled())
    {
      debugJEAccess(DebugLogLevel.VERBOSE, OperationStatus.SUCCESS,
                    database, null, null, null);
    }
    return count;
  }


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryID.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryIDSet.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -36,11 +36,6 @@
 */
public class EntryIDSet implements Iterable<EntryID>
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.EntryIDSet";


  /**

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EnvManager.java

@@ -22,11 +22,13 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.JebMessages.MSGID_JEB_CREATE_FAIL;
import static org.opends.server.messages.JebMessages.
@@ -41,11 +43,6 @@
 */
public class EnvManager
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.EnvManager";

  /**
   * A filename filter to match all kinds of JE files.
@@ -98,7 +95,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "createBackendDirectory", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        String message = getMessage(MSGID_JEB_CREATE_FAIL, e.getMessage());
        throw new JebException(MSGID_JEB_CREATE_FAIL, message, e);
      }
@@ -132,7 +132,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "removeFiles", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      String message = getMessage(MSGID_JEB_REMOVE_FAIL, e.getMessage());
      throw new JebException(MSGID_JEB_REMOVE_FAIL, message, e);
    }

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EqualityIndexer.java

@@ -22,11 +22,13 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;

import com.sleepycat.je.Transaction;
import com.sleepycat.je.DatabaseException;
@@ -50,11 +52,6 @@
 */
public class EqualityIndexer extends Indexer
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.EqualityIndexer";


  /**
@@ -346,7 +343,10 @@
      }
      catch (DirectoryException e)
      {
        assert debugException(CLASS_NAME, "indexAttribute", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -44,7 +44,9 @@
import java.io.IOException;
import java.util.*;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.JebMessages.*;
@@ -54,11 +56,6 @@
 */
public class ExportJob
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.ExportJob";

  /**
   * The requested LDIF export configuration.
@@ -202,7 +199,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "exportContainer", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          skippedCount++;
          System.err.printf("Malformed id2entry ID %s.%n",
                            StaticUtils.bytesToHex(key.getData()));
@@ -222,7 +222,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "exportContainer", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          skippedCount++;
          System.err.printf("Malformed id2entry record for ID %d:%n%s%n",
                            entryID.longValue(),

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2CIndexer.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2Entry.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 - 2007 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ID2SIndexer.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IDSetIterator.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportContext.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportJob.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 - 2007 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -32,11 +32,10 @@
import com.sleepycat.je.Transaction;

import org.opends.server.api.Backend;
import org.opends.server.loggers.Debug;
import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.messages.JebMessages;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DebugLogCategory;
import org.opends.server.types.DebugLogSeverity;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
@@ -56,7 +55,8 @@
import java.util.TimerTask;
import java.util.concurrent.LinkedBlockingQueue;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.JebMessages.
     MSGID_JEB_IMPORT_ENTRY_EXISTS;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -70,11 +70,6 @@
 */
public class ImportJob implements Thread.UncaughtExceptionHandler
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.ImportJob";

  /**
   * The backend instance we are importing into.
@@ -207,9 +202,8 @@
    logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
             message, msgID);

    Debug.debugMessage(DebugLogCategory.BACKEND, DebugLogSeverity.INFO,
                       CLASS_NAME, "importLDIF",
                       rootContainer.getEnvironmentConfig().toString());
    DebugLogger.debugInfo(
        rootContainer.getEnvironmentConfig().toString());


    rootContainer.openEntryContainers(config.getBaseDNs());
@@ -429,7 +423,10 @@
      }
      catch (InterruptedException e)
      {
        assert debugException(CLASS_NAME, "merge", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -528,13 +525,19 @@
            }
            catch (LDIFException e)
            {
              assert debugException(CLASS_NAME, "processLDIF", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              // Update stats.
              rejectedCount++;
            }
            catch (DirectoryException e)
            {
              assert debugException(CLASS_NAME, "processLDIF", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              // Update stats.
              rejectedCount++;
            }
@@ -636,7 +639,10 @@
          }
          catch (InterruptedException e)
          {
            assert debugException(CLASS_NAME, "processEntry", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }
          }
        }
        else
@@ -716,7 +722,10 @@
        }
        catch (InterruptedException e)
        {
          assert debugException(CLASS_NAME, "processEntry", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
        }
      }


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ImportThread.java

@@ -22,11 +22,13 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.api.DirectoryThread;
import org.opends.server.types.AttributeType;
import org.opends.server.types.Entry;
@@ -46,11 +48,6 @@
 */
public class ImportThread extends DirectoryThread
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.ImportThread";

  /**
   * The import context of this thread.
@@ -248,7 +245,10 @@
        }
        catch (InterruptedException e)
        {
          assert debugException(CLASS_NAME, "run", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          continue;
        }

@@ -301,11 +301,17 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "run", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
    catch (IOException e)
    {
      assert debugException(CLASS_NAME, "run", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }
}

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Index.java

@@ -22,11 +22,13 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.JebMessages.
     MSGID_JEB_DATABASE_EXCEPTION;
import static org.opends.server.messages.MessageHandler.getMessage;
@@ -57,11 +59,6 @@
 */
public class Index
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.Index";


  /**
@@ -329,7 +326,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "readKey", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      return new EntryIDSet();
    }
  }
@@ -473,7 +473,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "readRange", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      return new EntryIDSet();
    }
  }
@@ -515,7 +518,10 @@
    }
    catch (DatabaseException e)
    {
      assert debugException(CLASS_NAME, "openCursor", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      int msgID = MSGID_JEB_DATABASE_EXCEPTION;
      String message = getMessage(msgID, e.getMessage());
      throw new JebException(msgID, message, e);

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexBuilder.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexConfig.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -34,11 +34,6 @@
 */
public class IndexConfig
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.IndexConfig";

  /**
   * The attribute type of the indexed attribute.

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexFilter.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorAllIds.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexIteratorRange.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -47,7 +47,9 @@
import java.util.TreeMap;
import java.util.WeakHashMap;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.messages.JebMessages.*;
@@ -58,11 +60,6 @@
 */
public class IndexMergeThread extends DirectoryThread
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.IndexMergeThread";

  /**
   * The buffer size to use when reading data from disk.
@@ -162,7 +159,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "run", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }

@@ -304,7 +304,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "run", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      e.printStackTrace();
      throw e;
    }

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexMod.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/IndexModComparator.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Indexer.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebException.java

@@ -22,13 +22,10 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

import static org.opends.server.loggers.Debug.debugConstructor;
import static org.opends.server.loggers.Debug.debugEnter;

/**
 * This class defines an exception that may be thrown if a problem occurs in the
 * JE backend database.
@@ -36,11 +33,6 @@
public class JebException
     extends Exception
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backend.je.JebException";


  /**
@@ -70,7 +62,6 @@
  {
    super(message);

    assert debugConstructor(CLASS_NAME, String.valueOf(message));

    this.messageID = messageID;
  }
@@ -89,8 +80,6 @@
  {
    super(message, cause);

    assert debugConstructor(CLASS_NAME, String.valueOf(message),
                            String.valueOf(cause));

    this.messageID = messageID;
  }
@@ -103,7 +92,6 @@
   */
  public int getMessageID()
  {
    assert debugEnter(CLASS_NAME, "getMessageID");

    return messageID;
  }

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/JebFormat.java

@@ -22,13 +22,11 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


import static org.opends.server.loggers.Debug.debugEnter;

import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.asn1.ASN1Element;
import org.opends.server.protocols.asn1.ASN1Exception;
@@ -57,11 +55,6 @@
 */
public class JebFormat
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.je.JebFormat";

  /**
   * The format version used by this class to encode and decode a DatabaseEntry.
@@ -92,7 +85,6 @@
  static public byte[] decodeDatabaseEntry(byte[] bytes)
       throws ASN1Exception,DataFormatException
  {
    assert debugEnter(CLASS_NAME, "decodeDatabaseEntry", String.valueOf(bytes));

    // FIXME: This array copy could be very costly on performance. We need to
    // FIXME: find a faster way to implement this versioning feature.
@@ -165,7 +157,6 @@
  static public Entry entryFromDatabase(byte[] bytes)
       throws DirectoryException,ASN1Exception,LDAPException,DataFormatException
  {
    assert debugEnter(CLASS_NAME, "entryFromDatabase", String.valueOf(bytes));

    byte[] uncompressedBytes = decodeDatabaseEntry(bytes);
    return decodeDirectoryServerEntry(uncompressedBytes);
@@ -185,8 +176,6 @@
  static private Entry decodeDirectoryServerEntry(byte[] bytes)
       throws DirectoryException,ASN1Exception,LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeDirectoryServerEntry",
                      String.valueOf(bytes));

    HashMap<ObjectClass, String> objectClasses;
    HashMap<AttributeType, List<Attribute>> userAttributes =
@@ -272,8 +261,6 @@
   */
  static public byte[] encodeDatabaseEntry(byte[] bytes, DataConfig dataConfig)
  {
    assert debugEnter(CLASS_NAME, "encodeDatabaseEntry",
                      String.valueOf(dataConfig));

    int uncompressedSize = 0;

@@ -325,8 +312,6 @@
   */
  static public byte[] entryToDatabase(Entry entry, DataConfig dataConfig)
  {
    assert debugEnter(CLASS_NAME, "entryToDatabase",
                      String.valueOf(dataConfig));

    byte[] uncompressedBytes = encodeDirectoryServerEntry(entry);
    return encodeDatabaseEntry(uncompressedBytes, dataConfig);
@@ -340,7 +325,6 @@
   */
  static public byte[] entryToDatabase(Entry entry)
  {
    assert debugEnter(CLASS_NAME, "entryToDatabase");

    return entryToDatabase(entry, new DataConfig());
  }
@@ -353,7 +337,6 @@
   */
  static private byte[] encodeDirectoryServerEntry(Entry entry)
  {
    assert debugEnter(CLASS_NAME, "encodeDirectoryServerEntry");

    // Encode the DN (LDAPDN).
    ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(4);

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/Longs.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeReader.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/MergeValue.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OctetStringKeyComparator.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/OrderingIndexer.java

@@ -22,11 +22,13 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;

import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.protocols.asn1.ASN1OctetString;
@@ -47,11 +49,6 @@
 */
public class OrderingIndexer extends Indexer
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.OrderingIndexer";


  /**
@@ -270,7 +267,10 @@
      }
      catch (DirectoryException e)
      {
        assert debugException(CLASS_NAME, "indexAttribute", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/PresenceIndexer.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -43,11 +43,6 @@
 */
public class PresenceIndexer extends Indexer
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.PresenceIndexer";


  /**

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -46,11 +46,15 @@
import java.io.FilenameFilter;

import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.opends.server.types.*;
import org.opends.server.loggers.Debug;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DN;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.FilePermission;
import static org.opends.server.loggers.Error.logError;
import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.Debug.debugEnter;
import static org.opends.server.loggers.debug.DebugLogger.debugInfo;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.JebMessages.
    MSGID_JEB_CACHE_SIZE_AFTER_PRELOAD;
@@ -71,11 +75,6 @@
 */
public class RootContainer
{
    /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.RootContainer";

  /**
   * The JE database environment.
@@ -169,9 +168,10 @@
    env = new Environment(backendDirectory,
                          envConfig);

    Debug.debugMessage(DebugLogCategory.BACKEND, DebugLogSeverity.INFO,
                         CLASS_NAME, "initializeBackend",
                         env.getConfig().toString());
    if (debugEnabled())
    {
      debugInfo(env.getConfig().toString());
    }
  }

  /**
@@ -365,7 +365,6 @@
   */
  public void preload()
  {
    assert debugEnter(CLASS_NAME, "preload");

    long timeLimit = config.getPreloadTimeLimit();

@@ -425,7 +424,10 @@
      }
      catch (DatabaseException e)
      {
        assert debugException(CLASS_NAME, "preload", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }
  }
@@ -440,7 +442,6 @@
  private void cleanDatabase()
       throws DatabaseException
  {
    assert debugEnter(CLASS_NAME, "cleanDatabase");

    int msgID;
    String message;
@@ -611,9 +612,10 @@

    config = newConfig;

    Debug.debugMessage(DebugLogCategory.BACKEND, DebugLogSeverity.INFO,
                       CLASS_NAME, "applyNewConfiguration",
                       env.getConfig().toString());
    if (debugEnabled())
    {
      debugInfo(env.getConfig().toString());
    }
  }

  /**

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/SubstringIndexer.java

@@ -22,11 +22,13 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import com.sleepycat.je.Transaction;
import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.types.Attribute;
@@ -46,11 +48,6 @@
 */
public class SubstringIndexer extends Indexer
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.SubstringIndexer";


  /**
@@ -203,7 +200,10 @@
        }
        catch (DirectoryException e)
        {
          assert debugException(CLASS_NAME, "indexAttribute", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
        }
      }
    }

 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyConfig.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;


 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 - 2007 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.jeb;

@@ -55,7 +55,9 @@
import org.opends.server.util.StaticUtils;
import org.opends.server.util.ServerConstants;

import static org.opends.server.loggers.Debug.debugException;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.getMessage;
import static org.opends.server.messages.JebMessages.*;

@@ -75,11 +77,6 @@
 */
public class VerifyJob
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.jeb.VerifyJob";

  /**
   * The verify configuration.
@@ -448,7 +445,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateID2Entry", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("Malformed id2entry ID %s.%n",
                            StaticUtils.bytesToHex(key.getData()));
@@ -464,7 +464,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateID2Entry", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("Malformed id2entry record for ID %d:%n%s%n",
              entryID.longValue(),
@@ -553,7 +556,10 @@
        }
        catch (DirectoryException e)
        {
          assert debugException(CLASS_NAME, "iterateDN2ID", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("File dn2id has malformed key %s.%n",
                            StaticUtils.bytesToHex(key.getData()));
@@ -567,7 +573,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateDN2ID", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("File dn2id has malformed ID for DN <%s>:%n%s%n",
                            dn.toNormalizedString(),
@@ -582,7 +591,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateDN2ID", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.println(e.getMessage());
          continue;
@@ -643,7 +655,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateID2Children", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("File id2children has malformed ID %s%n",
                            StaticUtils.bytesToHex(key.getData()));
@@ -659,7 +674,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateID2Children", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("File id2children has malformed ID list " +
                            "for ID %s:%n%s%n",
@@ -679,7 +697,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "iterateID2Children", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }
            errorCount++;
            System.err.println(e.getMessage());
            continue;
@@ -702,7 +723,10 @@
            }
            catch (Exception e)
            {
              assert debugException(CLASS_NAME, "iterateID2Children", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              errorCount++;
              System.err.println(e.getMessage());
              continue;
@@ -766,7 +790,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateID2Subtree", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("File id2subtree has malformed ID %s%n",
                            StaticUtils.bytesToHex(key.getData()));
@@ -781,7 +808,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateID2Subtree", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("File id2subtree has malformed ID list " +
                            "for ID %s:%n%s%n",
@@ -801,7 +831,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "iterateID2Subtree", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }
            errorCount++;
            System.err.println(e.getMessage());
            continue;
@@ -824,7 +857,10 @@
            }
            catch (Exception e)
            {
              assert debugException(CLASS_NAME, "iterateID2Subtree", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              errorCount++;
              System.err.println(e.getMessage());
              continue;
@@ -949,7 +985,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "iterateAttrIndex", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          errorCount++;
          System.err.printf("Malformed ID list: %s%n%s",
                            StaticUtils.bytesToHex(data.getData()),
@@ -1014,7 +1053,10 @@
            }
            catch (Exception e)
            {
              assert debugException(CLASS_NAME, "iterateAttrIndex", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              errorCount++;
              System.err.println(e.getMessage());
              continue;
@@ -1040,7 +1082,10 @@
            }
            catch (DirectoryException e)
            {
              assert debugException(CLASS_NAME, "iterateAttrIndex", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
            }
          }
        }
@@ -1106,7 +1151,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "verifyDN2ID", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      System.err.printf("File dn2id has error reading key %s: %s.%n",
                        dn.toNormalizedString(),
                        e.getMessage());
@@ -1129,7 +1177,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "verifyDN2ID", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        System.err.printf("File dn2id has error reading key %s: %s.%n",
                          parentDN.toNormalizedString(),
                          e.getMessage());
@@ -1164,7 +1215,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "verifyID2Children", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        System.err.printf("File dn2id has error reading key %s: %s.",
                          parentDN.toNormalizedString(),
                          e.getMessage());
@@ -1190,7 +1244,10 @@
        }
        catch (DatabaseException e)
        {
          assert debugException(CLASS_NAME, "verifyID2Children", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          System.err.printf("File id2children has error reading key %d: %s.",
                            parentID.longValue(), e.getMessage());
          errorCount++;
@@ -1222,7 +1279,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "verifyID2Children", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        System.err.printf("File dn2id has error reading key %s: %s.%n",
                          dn.toNormalizedString(),
                          e.getMessage());
@@ -1248,7 +1308,10 @@
        }
        catch (DatabaseException e)
        {
          assert debugException(CLASS_NAME, "verifyID2Subtree", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
          System.err.printf("File id2subtree has error reading key %d: %s.%n",
                            id.longValue(), e.getMessage());
          errorCount++;
@@ -1309,7 +1372,10 @@
      }
      catch (DirectoryException e)
      {
        assert debugException(CLASS_NAME, "verifyAttrIndex", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        System.err.printf("Error normalizing values of attribute %s in " +
                          "entry <%s>: %s.%n",
                          attrIndex.getAttributeType().toString(),
@@ -1360,7 +1426,10 @@
      }
      catch (DatabaseException e)
      {
        assert debugException(CLASS_NAME, "verifyAttribute", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
        System.err.printf("Error reading database: %s%n%s",
                          e.getMessage(),
                          keyDump(presenceIndex, presenceKey.getData()));
@@ -1399,7 +1468,10 @@
            }
            catch (DatabaseException e)
            {
              assert debugException(CLASS_NAME, "verifyAttribute", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              System.err.printf("Error reading database: %s%n%s",
                                e.getMessage(),
                                keyDump(equalityIndex, normalizedBytes));
@@ -1434,7 +1506,10 @@
              }
              catch (DatabaseException e)
              {
                assert debugException(CLASS_NAME, "verifyAttribute", e);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, e);
                }
                System.err.printf("Error reading database: %s%n%s",
                                  e.getMessage(),
                                  keyDump(substringIndex, key.getData()));
@@ -1472,7 +1547,10 @@
            }
            catch (DatabaseException e)
            {
              assert debugException(CLASS_NAME, "verifyAttribute", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
              System.err.printf("Error reading database: %s%n%s",
                                e.getMessage(),
                                keyDump(orderingIndex, normalizedBytes));
@@ -1504,11 +1582,6 @@
   */
  class ProgressTask extends TimerTask
  {
    /**
     * The fully-qualified name of this class for debugging purposes.
     */
    private static final String CLASS_NAME =
         "org.opends.server.backends.jeb.VerifyJob.ProgressTask";

    /**
     * The number of records that had been processed at the time of the
@@ -1591,7 +1664,10 @@
      }
      catch (DatabaseException e)
      {
        debugException(CLASS_NAME, "run", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }



 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/package-info.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */



 opendj-sdk/opends/src/server/org/opends/server/backends/package-info.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */



 opendj-sdk/opends/src/server/org/opends/server/backends/task/FailedDependencyAction.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.task;


 opendj-sdk/opends/src/server/org/opends/server/backends/task/RecurringTask.java

@@ -43,7 +43,9 @@
import org.opends.server.types.ResultCode;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.StaticUtils.*;
@@ -56,11 +58,6 @@
 */
public class RecurringTask
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.task.RecurringTask";



@@ -98,8 +95,6 @@
  public RecurringTask(TaskScheduler taskScheduler, Entry recurringTaskEntry)
         throws DirectoryException
  {
    assert debugConstructor(CLASS_NAME, String.valueOf(taskScheduler),
                            String.valueOf(recurringTaskEntry));

    this.taskScheduler        = taskScheduler;
    this.recurringTaskEntry   = recurringTaskEntry;
@@ -217,7 +212,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "<init>", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_RECURRINGTASK_CANNOT_LOAD_CLASS;
      String message = getMessage(msgID, String.valueOf(taskClassName),
@@ -236,7 +234,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "<init>", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_RECURRINGTASK_CANNOT_INSTANTIATE_CLASS_AS_TASK;
      String message = getMessage(msgID, String.valueOf(taskClassName),
@@ -254,7 +255,10 @@
    }
    catch (InitializationException ie)
    {
      assert debugException(CLASS_NAME, "<init>", ie);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ie);
      }

      int    msgID   = MSGID_RECURRINGTASK_CANNOT_INITIALIZE_INTERNAL;
      String message = getMessage(msgID, String.valueOf(taskClassName),
@@ -275,7 +279,6 @@
   */
  public String getRecurringTaskID()
  {
    assert debugEnter(CLASS_NAME, "getRecurringTaskID");

    return recurringTaskID;
  }
@@ -289,7 +292,6 @@
   */
  public DN getRecurringTaskEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getRecurringTaskEntryDN");

    return recurringTaskEntryDN;
  }
@@ -303,7 +305,6 @@
   */
  public Entry getRecurringTaskEntry()
  {
    assert debugEnter(CLASS_NAME, "getRecurringTaskEntry");

    return recurringTaskEntry;
  }
@@ -319,7 +320,6 @@
   */
  public String getTaskClassName()
  {
    assert debugEnter(CLASS_NAME, "getTaskClassName");

    return taskClassName;
  }
@@ -333,7 +333,6 @@
   */
  public Task scheduleNextIteration()
  {
    assert debugEnter(CLASS_NAME, "scheduleNextIteration");

    // NYI
    return null;

 opendj-sdk/opends/src/server/org/opends/server/backends/task/Task.java

@@ -54,8 +54,9 @@
import org.opends.server.util.TimeThread;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import org.opends.server.messages.MessageHandler;
@@ -71,11 +72,6 @@
public abstract class Task
       implements Comparable<Task>
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.task.Task";



@@ -146,8 +142,6 @@
                                           Entry taskEntry)
         throws InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeTaskInternal",
                      String.valueOf(taskEntry));

    this.taskScheduler = taskScheduler;
    this.taskEntry     = taskEntry;
@@ -223,7 +217,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "initializeTaskInternal", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_TASK_CANNOT_PARSE_SCHEDULED_START_TIME;
        String message = getMessage(msgID, timeString, taskDN);
@@ -254,7 +251,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "initializeTaskInternal", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_TASK_CANNOT_PARSE_ACTUAL_START_TIME;
        String message = getMessage(msgID, timeString, taskDN);
@@ -285,7 +285,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "initializeTaskInternal", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_TASK_CANNOT_PARSE_COMPLETION_TIME;
        String message = getMessage(msgID, timeString, taskDN);
@@ -343,9 +346,6 @@
  private String getAttributeValue(String attributeName, boolean isRequired)
          throws InitializationException
  {
    assert debugEnter(CLASS_NAME, "getAttributeValue",
                      String.valueOf(attributeName),
                      String.valueOf(isRequired));

    List<Attribute> attrList =
         taskEntry.getAttribute(attributeName.toLowerCase());
@@ -418,8 +418,6 @@
  private LinkedList<String> getAttributeValues(String attributeName)
          throws InitializationException
  {
    assert debugEnter(CLASS_NAME, "getAttributeValues",
                      String.valueOf(attributeName));

    LinkedList<String> valueStrings = new LinkedList<String>();

@@ -455,7 +453,6 @@
   */
  public final DN getTaskEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getTaskEntryDN");

    return taskEntryDN;
  }
@@ -469,7 +466,6 @@
   */
  public final Entry getTaskEntry()
  {
    assert debugEnter(CLASS_NAME, "getTaskEntry");

    return taskEntry;
  }
@@ -489,7 +485,6 @@
   */
  public final Operation getOperation()
  {
    assert debugEnter(CLASS_NAME, "getOperation");

    return operation;
  }
@@ -503,7 +498,6 @@
   */
  public final void setOperation(Operation operation)
  {
    assert debugEnter(CLASS_NAME, "setOperation", String.valueOf(operation));

    this.operation = operation;
  }
@@ -517,7 +511,6 @@
   */
  public final String getTaskID()
  {
    assert debugEnter(CLASS_NAME, "getTaskID");

    return taskID;
  }
@@ -534,7 +527,6 @@
   */
  public final String getRecurringTaskID()
  {
    assert debugEnter(CLASS_NAME, "getRecurringTaskID");

    return recurringTaskID;
  }
@@ -548,7 +540,6 @@
   */
  public final TaskState getTaskState()
  {
    assert debugEnter(CLASS_NAME, "getTaskState");

    return taskState;
  }
@@ -564,7 +555,6 @@
   */
  void setTaskState(TaskState taskState)
  {
    assert debugEnter(CLASS_NAME, "setTaskState", String.valueOf(taskState));

    Lock lock = taskScheduler.writeLockEntry(taskEntryDN);

@@ -607,7 +597,6 @@
   */
  public final long getScheduledStartTime()
  {
    assert debugEnter(CLASS_NAME, "getStartTime");

    return scheduledStartTime;
  }
@@ -624,7 +613,6 @@
   */
  public final long getActualStartTime()
  {
    assert debugEnter(CLASS_NAME, "getActualStartTime");

    return actualStartTime;
  }
@@ -640,8 +628,6 @@
   */
  private void setActualStartTime(long actualStartTime)
  {
    assert debugEnter(CLASS_NAME, "setActualStartTime",
                      String.valueOf(actualStartTime));

    Lock lock = taskScheduler.writeLockEntry(taskEntryDN);

@@ -689,7 +675,6 @@
   */
  public final long getCompletionTime()
  {
    assert debugEnter(CLASS_NAME, "getCompletionTime");

    return completionTime;
  }
@@ -705,8 +690,6 @@
   */
  private void setCompletionTime(long completionTime)
  {
    assert debugEnter(CLASS_NAME, "setCompletionTime",
                      String.valueOf(completionTime));

    Lock lock = taskScheduler.writeLockEntry(taskEntryDN);

@@ -751,7 +734,6 @@
   */
  public final LinkedList<String> getDependencyIDs()
  {
    assert debugEnter(CLASS_NAME, "getDependencyIDs");

    return dependencyIDs;
  }
@@ -767,7 +749,6 @@
   */
  public final FailedDependencyAction getFailedDependencyAction()
  {
    assert debugEnter(CLASS_NAME, "getFailedDependencyAction");

    return failedDependencyAction;
  }
@@ -787,7 +768,6 @@
   */
  public final LinkedList<String> getNotifyOnCompletionAddresses()
  {
    assert debugEnter(CLASS_NAME, "getNotifyOnCompletionAddresses");

    return notifyOnCompletion;
  }
@@ -805,7 +785,6 @@
   */
  public final LinkedList<String> getNotifyOnErrorAddresses()
  {
    assert debugEnter(CLASS_NAME, "getNotifyOnErrorAddresses");

    return notifyOnError;
  }
@@ -820,7 +799,6 @@
   */
  public final LinkedList<String> getLogMessages()
  {
    assert debugEnter(CLASS_NAME, "getLogMessages");

    return logMessages;
  }
@@ -912,9 +890,6 @@
  void addLogMessage(ErrorLogSeverity severity, int messageID,
                     String messageString)
  {
    assert debugEnter(CLASS_NAME, "addLogMessage",
                      String.valueOf(severity), String.valueOf(messageID),
                      String.valueOf(messageString));

    Lock lock = taskScheduler.writeLockEntry(taskEntryDN);

@@ -997,7 +972,6 @@
   */
  public final int compareTo(Task task)
  {
    assert debugEnter(CLASS_NAME, "compareTo", String.valueOf(task));

    if (completionTime > 0)
    {
@@ -1090,7 +1064,6 @@
   */
  public final TaskState execute()
  {
    assert debugEnter(CLASS_NAME, "execute");

    setActualStartTime(TimeThread.getTime());
    setTaskState(TaskState.RUNNING);
@@ -1103,7 +1076,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "execute", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      setTaskState(TaskState.STOPPED_BY_ERROR);

@@ -1138,7 +1114,6 @@
  public void initializeTask()
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "initializeTask");

    // No action is performed by default.
  }
@@ -1167,7 +1142,6 @@
   */
  public void interruptTask(TaskState interruptState, String interruptReason)
  {
    assert debugEnter(CLASS_NAME, "interruptTask");

    // No action is performed by default.
  }

 opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskBackend.java

@@ -65,8 +65,9 @@
import org.opends.server.types.SearchScope;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -83,11 +84,6 @@
       extends Backend
       implements ConfigurableComponent
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.task.TaskBackend";



@@ -161,7 +157,6 @@
  {
    super();

    assert debugConstructor(CLASS_NAME);


    // Perform all initialization in initializeBackend.
@@ -188,8 +183,6 @@
  public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
         throws ConfigException, InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeBackend",
                      String.valueOf(configEntry));


    // Make sure that a configuration entry was provided.  If not, then we will
@@ -232,7 +225,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "initializeBackend", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        // This should never happen.
        int    msgID   = MSGID_TASKBE_CANNOT_DECODE_RECURRING_TASK_BASE_DN;
@@ -250,7 +246,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "initializeBackend", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        // This should never happen.
        int    msgID   = MSGID_TASKBE_CANNOT_DECODE_SCHEDULED_TASK_BASE_DN;
@@ -285,7 +284,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_TASKBE_CANNOT_INITIALIZE_RETENTION_TIME;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -314,7 +316,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_TASKBE_CANNOT_INITIALIZE_BACKING_FILE;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -343,7 +348,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "initializeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
      String message = getMessage(msgID, taskRootDN.toString(),
@@ -367,7 +375,6 @@
   */
  public void finalizeBackend()
  {
    assert debugEnter(CLASS_NAME, "finalizeBackend");


    DirectoryServer.deregisterConfigurableComponent(this);
@@ -379,7 +386,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "finalizeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }

    try
@@ -392,7 +402,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "finalizeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }

    try
@@ -401,7 +414,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "finalizeBackend", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }
  }

@@ -414,7 +430,6 @@
   */
  public DN[] getBaseDNs()
  {
    assert debugEnter(CLASS_NAME, "getBaseDNs");

    return baseDNs;
  }
@@ -426,7 +441,6 @@
   */
  public long getEntryCount()
  {
    assert debugEnter(CLASS_NAME, "getEntryCount");

    if (taskScheduler != null)
    {
@@ -449,7 +463,6 @@
   */
  public boolean isLocal()
  {
    assert debugEnter(CLASS_NAME, "isLocal");

    // For the purposes of this method, this is a local backend.
    return true;
@@ -471,7 +484,6 @@
  public Entry getEntry(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getEntry", String.valueOf(entryDN));


    if (entryDN == null)
@@ -534,7 +546,6 @@
  public boolean entryExists(DN entryDN)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "entryExists", String.valueOf(entryDN));


    if (entryDN == null)
@@ -586,8 +597,6 @@
  public void addEntry(Entry entry, AddOperation addOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addEntry", String.valueOf(entry),
                      String.valueOf(addOperation));


    // Get the DN for the entry and then get its parent.
@@ -603,7 +612,6 @@
                                   msgID);
    }


    // If the parent DN is equal to the parent for scheduled tasks, then try to
    // treat the provided entry like a scheduled task.
    if (parentDN.equals(scheduledTaskParentDN))
@@ -613,7 +621,6 @@
      return;
    }


    // If the parent DN is equal to the parent for recurring tasks, then try to
    // treat the provided entry like a recurring task.
    if (parentDN.equals(recurringTaskParentDN))
@@ -623,7 +630,6 @@
      return;
    }


    // We won't allow the entry to be added.
    int msgID = MSGID_TASKBE_ADD_DISALLOWED_DN;
    String message = getMessage(msgID, String.valueOf(scheduledTaskParentDN),
@@ -651,8 +657,6 @@
  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "deleteEntry", String.valueOf(entryDN),
                      String.valueOf(deleteOperation));


    // Get the parent for the provided entry DN.  It must be either the
@@ -740,8 +744,6 @@
  public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "replaceEntry", String.valueOf(entry),
                      String.valueOf(modifyOperation));

    // FIXME -- We need to support this.
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
@@ -770,8 +772,6 @@
                                   ModifyDNOperation modifyDNOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "renameEntry", String.valueOf(currentDN),
                      String.valueOf(entry), String.valueOf(modifyDNOperation));


    int    msgID   = MSGID_TASKBE_MODIFY_DN_NOT_SUPPORTED;
@@ -799,7 +799,6 @@
  public void search(SearchOperation searchOperation)
         throws DirectoryException, CancelledOperationException
  {
    assert debugEnter(CLASS_NAME, "search", String.valueOf(searchOperation));


    // Look at the base DN and scope for the search operation to decide which
@@ -1020,7 +1019,6 @@
   */
  public HashSet<String> getSupportedControls()
  {
    assert debugEnter(CLASS_NAME, "getSupportedControls");

    return supportedControls;
  }
@@ -1034,7 +1032,6 @@
   */
  public HashSet<String> getSupportedFeatures()
  {
    assert debugEnter(CLASS_NAME, "getSupportedFeatures");

    return supportedFeatures;
  }
@@ -1050,7 +1047,6 @@
   */
  public boolean supportsLDIFExport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFExport");

    // LDIF exports are supported.
    return true;
@@ -1075,7 +1071,6 @@
                         LDIFExportConfig exportConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "exportLDIF", String.valueOf(exportConfig));


    // FIXME -- Implement support for exporting to LDIF.
@@ -1092,7 +1087,6 @@
   */
  public boolean supportsLDIFImport()
  {
    assert debugEnter(CLASS_NAME, "supportsLDIFImport");

    // This backend does not support LDIF imports.
    return false;
@@ -1117,7 +1111,6 @@
                         LDIFImportConfig importConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "importLDIF", String.valueOf(importConfig));


    // This backend does not support LDIF imports.
@@ -1142,7 +1135,6 @@
   */
  public boolean supportsBackup()
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");

    // This backend does provide a backup/restore mechanism.
    return true;
@@ -1168,7 +1160,6 @@
  public boolean supportsBackup(BackupConfig backupConfig,
                                StringBuilder unsupportedReason)
  {
    assert debugEnter(CLASS_NAME, "supportsBackup");


    // This backend does provide a backup/restore mechanism.
@@ -1193,7 +1184,6 @@
  public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "createBackup", String.valueOf(backupConfig));


    // NYI -- Create the backup.
@@ -1217,9 +1207,6 @@
                           String backupID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeBackup",
                      String.valueOf(backupDirectory),
                      String.valueOf(backupID));


    // NYI -- Remove the backup.
@@ -1235,7 +1222,6 @@
   */
  public boolean supportsRestore()
  {
    assert debugEnter(CLASS_NAME, "supportsRestore");


    // This backend does provide a backup/restore mechanism.
@@ -1261,8 +1247,6 @@
                            RestoreConfig restoreConfig)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "restoreBackup",
                      String.valueOf(restoreConfig));


    // NYI -- Restore the backup.
@@ -1279,7 +1263,6 @@
   */
  public DN getConfigurableComponentEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");

    return configEntryDN;
  }
@@ -1295,7 +1278,6 @@
   */
  public List<ConfigAttribute> getConfigurationAttributes()
  {
    assert debugEnter(CLASS_NAME, "getConfigurationAttributes");

    LinkedList<ConfigAttribute> attrList = new LinkedList<ConfigAttribute>();

@@ -1333,8 +1315,6 @@
  public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
                                            List<String> unacceptableReasons)
  {
    assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration",
                      String.valueOf(configEntry), "java.util.List<String>");


    boolean configIsAcceptable = true;
@@ -1395,7 +1375,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "hasAcceptableConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_TASKBE_ERROR_GETTING_BACKING_FILE;
      unacceptableReasons.add(getMessage(msgID, ATTR_TASK_BACKING_FILE,
@@ -1424,7 +1407,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "hasAcceptableConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_TASKBE_ERROR_GETTING_RETENTION_TIME;
      unacceptableReasons.add(getMessage(msgID, ATTR_TASK_RETENTION_TIME,
@@ -1458,9 +1444,6 @@
  public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
                                                  boolean detailedResults)
  {
    assert debugEnter(CLASS_NAME, "applyNewConfiguration",
                      String.valueOf(configEntry),
                      String.valueOf(detailedResults));


    ResultCode        resultCode          = ResultCode.SUCCESS;
@@ -1522,7 +1505,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "applyNewConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_TASKBE_ERROR_GETTING_BACKING_FILE;
      messages.add(getMessage(msgID, ATTR_TASK_BACKING_FILE,
@@ -1560,7 +1546,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "applyNewConfiguration", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int msgID = MSGID_TASKBE_ERROR_GETTING_RETENTION_TIME;
      messages.add(getMessage(msgID, ATTR_TASK_RETENTION_TIME,
@@ -1608,7 +1597,6 @@
   */
  public DN getConfigEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getConfigEntryDN");

    return configEntryDN;
  }
@@ -1624,7 +1612,6 @@
   */
  public String getTaskBackingFile()
  {
    assert debugEnter(CLASS_NAME, "getTaskBackingFile");

    File f = getFileForPath(taskBackingFile);
    return f.getPath();
@@ -1641,7 +1628,6 @@
   */
  public long getRetentionTime()
  {
    assert debugEnter(CLASS_NAME, "getRetentionTime");

    return retentionTime;
  }
@@ -1657,7 +1643,6 @@
   */
  public DN getTaskRootDN()
  {
    assert debugEnter(CLASS_NAME, "getTaskRootDN");

    return taskRootDN;
  }
@@ -1673,7 +1658,6 @@
   */
  public DN getRecurringTasksParentDN()
  {
    assert debugEnter(CLASS_NAME, "getRecurringTasksParentDN");

    return recurringTaskParentDN;
  }
@@ -1689,7 +1673,6 @@
   */
  public DN getScheduledTasksParentDN()
  {
    assert debugEnter(CLASS_NAME, "getScheduledTasksParentDN");

    return scheduledTaskParentDN;
  }
@@ -1706,8 +1689,6 @@
   */
  public Task getScheduledTask(DN taskEntryDN)
  {
    assert debugEnter(CLASS_NAME, "getScheduledTask",
                      String.valueOf(taskEntryDN));

    return taskScheduler.getScheduledTask(taskEntryDN);
  }
@@ -1725,8 +1706,6 @@
   */
  public RecurringTask getRecurringTask(DN taskEntryDN)
  {
    assert debugEnter(CLASS_NAME, "getScheduledTask",
                      String.valueOf(taskEntryDN));

    return taskScheduler.getRecurringTask(taskEntryDN);
  }

 opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskScheduler.java

@@ -66,8 +66,10 @@
import org.opends.server.util.TimeThread;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.Error.*;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -85,7 +87,7 @@
       implements AlertGenerator
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   * The fully-qualified name of this class.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.task.TaskScheduler";
@@ -165,7 +167,6 @@
  {
    super("Task Scheduler Thread");

    assert debugConstructor(CLASS_NAME, String.valueOf(taskBackend));

    this.taskBackend = taskBackend;

@@ -208,9 +209,6 @@
                               boolean scheduleIteration)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "addRecurringTask",
                      String.valueOf(recurringTask),
                      String.valueOf(scheduleIteration));

    schedulerLock.lock();

@@ -262,8 +260,6 @@
  public RecurringTask removeRecurringTask(String recurringTaskID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeRecurringTask",
                      String.valueOf(recurringTaskID));

    schedulerLock.lock();

@@ -315,7 +311,6 @@
  public void scheduleTask(Task task, boolean writeState)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "scheduleTask", String.valueOf(task));

    schedulerLock.lock();

@@ -386,7 +381,6 @@
   */
  public Task cancelTask(String taskID)
  {
    assert debugEnter(CLASS_NAME, "cancelTask", String.valueOf(taskID));

    schedulerLock.lock();

@@ -430,7 +424,6 @@
  public Task removePendingTask(String taskID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removePendingTask", String.valueOf(taskID));

    schedulerLock.lock();

@@ -479,8 +472,6 @@
  public Task removeCompletedTask(String taskID)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "removeCompletedTask",
                      String.valueOf(taskID));

    schedulerLock.lock();

@@ -526,7 +517,6 @@
   */
  public boolean threadDone(TaskThread taskThread, Task completedTask)
  {
    assert debugEnter(CLASS_NAME, "threadDone", String.valueOf(taskThread));

    schedulerLock.lock();

@@ -573,7 +563,10 @@
            }
            catch (DirectoryException de)
            {
              assert debugException(CLASS_NAME, "threadDone", de);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, de);
              }

              int msgID = MSGID_TASKSCHED_ERROR_SCHEDULING_RECURRING_ITERATION;
              String message = getMessage(msgID, recurringTaskID,
@@ -620,8 +613,6 @@
   */
  public void addCompletedTask(Task completedTask)
  {
    assert debugEnter(CLASS_NAME, "addCompletedTask",
                      String.valueOf(completedTask));

    // The scheduler lock is reentrant, so even if we already hold it, we can
    // acquire it again.
@@ -648,7 +639,6 @@
   */
  public void stopScheduler()
  {
    assert debugEnter(CLASS_NAME, "stopScheduler");

    stopRequested = true;

@@ -658,7 +648,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "stopScheduler", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }

    try
@@ -667,7 +660,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "stopScheduler", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
    }

    pendingTasks.clear();
@@ -699,8 +695,6 @@
  public void interruptRunningTasks(TaskState interruptState,
                                    String interruptReason, boolean waitForStop)
  {
    assert debugEnter(CLASS_NAME, "interruptRunningTasks",
                      String.valueOf(waitForStop));


    // Grab a copy of the running threads so that we can operate on them without
@@ -729,7 +723,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "interruptRunningTasks", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }

@@ -745,7 +742,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "interruptRunningTasks", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
        }
      }
    }
@@ -759,7 +759,6 @@
   */
  public void run()
  {
    assert debugEnter(CLASS_NAME, "run");

    isRunning       = true;
    schedulerThread = currentThread();
@@ -887,7 +886,6 @@
   */
  private TaskState shouldStart(Task task)
  {
    assert debugEnter(CLASS_NAME, "shouldStart", String.valueOf(task));

    if (! isRunning)
    {
@@ -929,7 +927,6 @@
  private void initializeTasksFromBackingFile()
          throws InitializationException
  {
    assert debugEnter(CLASS_NAME, "initializeTasksFromBackingFile");

    String backingFilePath = taskBackend.getTaskBackingFile();

@@ -960,8 +957,10 @@
        }
        catch (LDIFException le)
        {
          assert debugException(CLASS_NAME, "initializeTasksFromBackingFile",
                                le);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, le);
          }

          if (le.canContinueReading())
          {
@@ -981,8 +980,10 @@
            }
            catch (Exception e)
            {
              assert debugException(CLASS_NAME,
                                    "initializeTasksFromBackingFile", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
            }

            int    msgID   = MSGID_TASKSCHED_CANNOT_PARSE_ENTRY_FATAL;
@@ -1030,8 +1031,10 @@
            }
            catch (DirectoryException de)
            {
              assert debugException(CLASS_NAME,
                                    "initializeTasksFromBackingFile", de);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, de);
              }

              int msgID =
                   MSGID_TASKSCHED_CANNOT_SCHEDULE_RECURRING_TASK_FROM_ENTRY;
@@ -1057,8 +1060,10 @@
            }
            catch (DirectoryException de)
            {
              assert debugException(CLASS_NAME,
                                    "initializeTasksFromBackingFile", de);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, de);
              }

              int    msgID   = MSGID_TASKSCHED_CANNOT_SCHEDULE_TASK_FROM_ENTRY;
              String message = getMessage(msgID, String.valueOf(entryDN),
@@ -1082,7 +1087,10 @@
    }
    catch (IOException ioe)
    {
      assert debugException(CLASS_NAME, "initializeTasksFromBackingFile", ioe);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ioe);
      }

      int msgID = MSGID_TASKSCHED_ERROR_READING_TASK_BACKING_FILE;
      String message = getMessage(msgID, String.valueOf(backingFilePath),
@@ -1104,7 +1112,6 @@
  private void createNewTaskBackingFile()
          throws InitializationException
  {
    assert debugEnter(CLASS_NAME, "createNewTaskBackingFile");

    String backingFile = taskBackend.getTaskBackingFile();
    LDIFExportConfig exportConfig =
@@ -1138,7 +1145,10 @@
    }
    catch (IOException ioe)
    {
      assert debugException(CLASS_NAME, "createNewTaskBackingFile", ioe);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ioe);
      }

      int    msgID   = MSGID_TASKSCHED_CANNOT_CREATE_BACKING_FILE;
      String message = getMessage(msgID, backingFile,
@@ -1147,7 +1157,10 @@
    }
    catch (LDIFException le)
    {
      assert debugException(CLASS_NAME, "createNewTaskBackingFile", le);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, le);
      }


      int    msgID   = MSGID_TASKSCHED_CANNOT_CREATE_BACKING_FILE;
@@ -1163,7 +1176,6 @@
   */
  public void writeState()
  {
    assert debugEnter(CLASS_NAME, "writeState");


    String backingFilePath = taskBackend.getTaskBackingFile();
@@ -1218,7 +1230,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "writeState", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }


@@ -1233,7 +1248,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "writeState", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int msgID = MSGID_TASKSCHED_CANNOT_RENAME_CURRENT_BACKING_FILE;
        String message = getMessage(msgID, String.valueOf(backingFilePath),
@@ -1256,7 +1274,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "writeState", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int msgID = MSGID_TASKSCHED_CANNOT_RENAME_NEW_BACKING_FILE;
        String message = getMessage(msgID, String.valueOf(tmpFilePath),
@@ -1272,7 +1293,10 @@
    }
    catch (IOException ioe)
    {
      assert debugException(CLASS_NAME, "createNewTaskBackingFile", ioe);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ioe);
      }

      int    msgID   = MSGID_TASKSCHED_CANNOT_WRITE_BACKING_FILE;
      String message = getMessage(msgID, tmpFilePath,
@@ -1285,7 +1309,10 @@
    }
    catch (LDIFException le)
    {
      assert debugException(CLASS_NAME, "createNewTaskBackingFile", le);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, le);
      }


      int    msgID   = MSGID_TASKSCHED_CANNOT_WRITE_BACKING_FILE;
@@ -1298,7 +1325,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "createNewTaskBackingFile", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_TASKSCHED_CANNOT_WRITE_BACKING_FILE;
      String message = getMessage(msgID, tmpFilePath,
@@ -1324,7 +1354,6 @@
   */
  public long getEntryCount()
  {
    assert debugEnter(CLASS_NAME, "getEntryCount");

    schedulerLock.lock();

@@ -1349,7 +1378,6 @@
   */
  public Entry getTaskRootEntry()
  {
    assert debugEnter(CLASS_NAME, "getTaskRootEntry");

    return taskRootEntry;
  }
@@ -1365,7 +1393,6 @@
   */
  public Entry getScheduledTaskParentEntry()
  {
    assert debugEnter(CLASS_NAME, "getScheduledTaskParentEntry");

    return scheduledTaskParentEntry;
  }
@@ -1381,7 +1408,6 @@
   */
  public Entry getRecurringTaskParentEntry()
  {
    assert debugEnter(CLASS_NAME, "getRecurringTaskParentEntry");

    return recurringTaskParentEntry;
  }
@@ -1398,7 +1424,6 @@
   */
  public Task getScheduledTask(String taskID)
  {
    assert debugEnter(CLASS_NAME, "getScheduledTask", String.valueOf(taskID));

    schedulerLock.lock();

@@ -1425,8 +1450,6 @@
   */
  public Task getScheduledTask(DN taskEntryDN)
  {
    assert debugEnter(CLASS_NAME, "getScheduledTask",
                      String.valueOf(taskEntryDN));

    schedulerLock.lock();

@@ -1460,7 +1483,6 @@
   */
  Lock writeLockEntry(DN entryDN)
  {
    assert debugEnter(CLASS_NAME, "lockEntry", String.valueOf(entryDN));

    Lock lock = LockManager.lockWrite(entryDN);
    while (lock == null)
@@ -1486,7 +1508,6 @@
  Lock readLockEntry(DN entryDN)
       throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "lockEntry", String.valueOf(entryDN));

    Lock lock = LockManager.lockRead(entryDN);
    for (int i=0; ((lock == null) && (i < 4)); i++)
@@ -1517,8 +1538,6 @@
   */
  void unlockEntry(DN entryDN, Lock lock)
  {
    assert debugEnter(CLASS_NAME, "unlockEntry", String.valueOf(entryDN),
                      String.valueOf(lock));

    LockManager.unlock(entryDN, lock);
  }
@@ -1537,8 +1556,6 @@
   */
  public Entry getScheduledTaskEntry(DN scheduledTaskEntryDN)
  {
    assert debugEnter(CLASS_NAME, "getScheduledTaskEntry",
                      String.valueOf(scheduledTaskEntryDN));


    schedulerLock.lock();
@@ -1584,8 +1601,6 @@
  public boolean searchScheduledTasks(SearchOperation searchOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "searchScheduledTasks",
                      String.valueOf(searchOperation));

    SearchFilter filter = searchOperation.getFilter();

@@ -1636,8 +1651,6 @@
   */
  public RecurringTask getRecurringTask(String recurringTaskID)
  {
    assert debugEnter(CLASS_NAME, "getRecurringTask",
                      String.valueOf(recurringTaskID));

    schedulerLock.lock();

@@ -1664,8 +1677,6 @@
   */
  public RecurringTask getRecurringTask(DN recurringTaskEntryDN)
  {
    assert debugEnter(CLASS_NAME, "getRecurringTask",
                      String.valueOf(recurringTaskEntryDN));

    schedulerLock.lock();

@@ -1701,8 +1712,6 @@
   */
  public Entry getRecurringTaskEntry(DN recurringTaskEntryDN)
  {
    assert debugEnter(CLASS_NAME, "getRecurringTaskEntry",
                      String.valueOf(recurringTaskEntryDN));


    schedulerLock.lock();
@@ -1748,8 +1757,6 @@
  public boolean searchRecurringTasks(SearchOperation searchOperation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "searchRecurringTasks",
                      String.valueOf(searchOperation));

    SearchFilter filter = searchOperation.getFilter();

@@ -1805,8 +1812,6 @@
  public Task entryToScheduledTask(Entry entry, Operation operation)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "entryToScheduledTask",
                      String.valueOf(entry));


    // Get the name of the class that implements the task logic.
@@ -1866,7 +1871,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "entryToScheduledTask", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_TASKSCHED_CANNOT_LOAD_CLASS;
      String message = getMessage(msgID, String.valueOf(taskClassName),
@@ -1885,7 +1893,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "entryToScheduledTask", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_TASKSCHED_CANNOT_INSTANTIATE_CLASS_AS_TASK;
      String message = getMessage(msgID, String.valueOf(taskClassName));
@@ -1901,7 +1912,10 @@
    }
    catch (InitializationException ie)
    {
      assert debugException(CLASS_NAME, "entryToScheduledTask", ie);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ie);
      }

      int    msgID   = MSGID_TASKSCHED_CANNOT_INITIALIZE_INTERNAL;
      String message = getMessage(msgID, String.valueOf(taskClassName),
@@ -1941,8 +1955,6 @@
  public RecurringTask entryToRecurringTask(Entry entry)
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "entryToRecurringTask",
                      String.valueOf(entry));

    return new RecurringTask(this, entry);
  }
@@ -1958,7 +1970,6 @@
   */
  public DN getComponentEntryDN()
  {
    assert debugEnter(CLASS_NAME, "getComponentEntryDN");

    return taskBackend.getConfigEntryDN();
  }
@@ -1974,7 +1985,6 @@
   */
  public String getClassName()
  {
    assert debugEnter(CLASS_NAME, "getClassName");

    return CLASS_NAME;
  }
@@ -1993,7 +2003,6 @@
   */
  public LinkedHashMap<String,String> getAlerts()
  {
    assert debugEnter(CLASS_NAME, "getAlerts");

    LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();


 opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskState.java

@@ -22,16 +22,11 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.task;



import static org.opends.server.loggers.Debug.*;



/**
 * This enumeration defines the various states that a task can have during its
 * lifetime.
@@ -126,11 +121,6 @@



  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.task.TaskState";



@@ -145,7 +135,7 @@
   */
  public static boolean isPending(TaskState taskState)
  {
    assert debugEnter(CLASS_NAME, "isPending", String.valueOf(taskState));


    switch (taskState)
    {
@@ -170,7 +160,7 @@
   */
  public static boolean isRunning(TaskState taskState)
  {
    assert debugEnter(CLASS_NAME, "isRunning", String.valueOf(taskState));


    switch (taskState)
    {
@@ -196,7 +186,7 @@
   */
  public static boolean isDone(TaskState taskState)
  {
    assert debugEnter(CLASS_NAME, "isDone", String.valueOf(taskState));


    switch (taskState)
    {
@@ -224,7 +214,7 @@
   */
  public static boolean isSuccessful(TaskState taskState)
  {
    assert debugEnter(CLASS_NAME, "isDone", String.valueOf(taskState));


    switch (taskState)
    {

 opendj-sdk/opends/src/server/org/opends/server/backends/task/TaskThread.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.backends.task;

@@ -31,7 +31,9 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.types.ErrorLogSeverity;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.BackendMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.StaticUtils.*;
@@ -46,11 +48,6 @@
public class TaskThread
       extends DirectoryThread
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.backends.task.TaskThread";



@@ -83,8 +80,6 @@
  {
    super("Task Thread " + threadID);

    assert debugConstructor(CLASS_NAME, String.valueOf(taskScheduler),
                            String.valueOf(threadID));

    this.taskScheduler = taskScheduler;
    this.threadID      = threadID;
@@ -105,7 +100,6 @@
   */
  public Task getTask()
  {
    assert debugEnter(CLASS_NAME, "getTask");

    return task;
  }
@@ -120,7 +114,6 @@
   */
  public void setTask(Task task)
  {
    assert debugEnter(CLASS_NAME, "setTask", String.valueOf(task));

    this.task = task;

@@ -145,7 +138,6 @@
  public void interruptTask(TaskState interruptState, String interruptReason,
                            boolean exitThread)
  {
    assert debugEnter(CLASS_NAME, "interruptTask", String.valueOf(exitThread));

    if (task != null)
    {
@@ -155,7 +147,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "interruptTask", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }

@@ -173,7 +168,6 @@
   */
  public void run()
  {
    assert debugEnter(CLASS_NAME, "run");

    while (! exitRequested)
    {
@@ -188,7 +182,10 @@
        }
        catch (InterruptedException ie)
        {
          assert debugException(CLASS_NAME, "run", ie);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, ie);
          }
        }

        continue;
@@ -201,7 +198,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "run", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_TASK_EXECUTE_FAILED;
        String message = getMessage(msgID,

 opendj-sdk/opends/src/server/org/opends/server/backends/task/package-info.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */



 opendj-sdk/opends/src/server/org/opends/server/config/BooleanConfigAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -43,7 +43,6 @@
import org.opends.server.types.AttributeValue;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -59,11 +58,6 @@
public class BooleanConfigAttribute
       extends ConfigAttribute
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.BooleanConfigAttribute";



@@ -92,9 +86,6 @@
  {
    super(name, description, true, false, requiresAdminAction);

    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(description),
                            String.valueOf(requiresAdminAction));
  }


@@ -119,11 +110,6 @@
    super(name, description, true, false, requiresAdminAction,
          getValueSet(value));

    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(description),
                            String.valueOf(requiresAdminAction),
                            String.valueOf(value));

    activeValue  = value;
    pendingValue = value;
  }
@@ -152,11 +138,6 @@
    super(name, description, true, false, requiresAdminAction,
          getValueSet(activeValue), true, getValueSet(pendingValue));

    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(description),
                            String.valueOf(requiresAdminAction),
                            String.valueOf(activeValue),
                            String.valueOf(pendingValue));

    this.activeValue  = activeValue;
    this.pendingValue = pendingValue;
@@ -174,7 +155,6 @@
   */
  public String getDataType()
  {
    assert debugEnter(CLASS_NAME, "getDataType");

    return "Boolean";
  }
@@ -188,7 +168,6 @@
   */
  public AttributeSyntax getSyntax()
  {
    assert debugEnter(CLASS_NAME,"getSyntax");

    return DirectoryServer.getDefaultBooleanSyntax();
  }
@@ -202,7 +181,6 @@
   */
  public boolean activeValue()
  {
    assert debugEnter(CLASS_NAME, "booleanValue");

    return activeValue;
  }
@@ -217,7 +195,6 @@
   */
  public boolean pendingValue()
  {
    assert debugEnter(CLASS_NAME, "booleanValue");

    if (hasPendingValues())
    {
@@ -238,8 +215,6 @@
   */
  public void setValue(boolean booleanValue)
  {
    assert debugEnter(CLASS_NAME, "setValue",
                      String.valueOf(booleanValue));

    if (requiresAdminAction())
    {
@@ -264,7 +239,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(boolean booleanValue)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(booleanValue));

    LinkedHashSet<AttributeValue> valueSet =
         new LinkedHashSet<AttributeValue>(1);
@@ -291,7 +265,6 @@
   */
  public void applyPendingValues()
  {
    assert debugEnter(CLASS_NAME, "applyPendingValues");

    if (! hasPendingValues())
    {
@@ -319,8 +292,6 @@
  public boolean valueIsAcceptable(AttributeValue value,
                                   StringBuilder rejectReason)
  {
    assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
                      "java.lang.StringBuilder");

    String stringValue = value.getStringValue();
    if (stringValue.equalsIgnoreCase(CONFIG_VALUE_TRUE) ||
@@ -360,9 +331,6 @@
                              boolean allowFailures)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "stringsToValues",
                      String.valueOf(valueStrings),
                      String.valueOf(allowFailures));

    if ((valueStrings == null) || valueStrings.isEmpty())
    {
@@ -413,7 +381,6 @@
   */
  public List<String> activeValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "activeValuesToStrings");

    ArrayList<String> valueStrings = new ArrayList<String>(1);
    valueStrings.add(String.valueOf(activeValue));
@@ -436,7 +403,6 @@
   */
  public List<String> pendingValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "pendingValuesToStrings");

    if (hasPendingValues())
    {
@@ -477,8 +443,6 @@
  public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute",
                      String.valueOf(attributeList));


    boolean activeValue     = false;
@@ -644,7 +608,6 @@
   */
  public javax.management.Attribute toJMXAttribute()
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute");

    return new javax.management.Attribute(getName(), activeValue);
  }
@@ -677,8 +640,6 @@
   */
  public void toJMXAttribute(AttributeList attributeList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute",
                      String.valueOf(attributeList));

    attributeList.add(new javax.management.Attribute(getName(), activeValue));

@@ -705,8 +666,6 @@
   */
  public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
                      String.valueOf(attributeInfoList));

    attributeInfoList.add(new MBeanAttributeInfo(getName(),
                                                 Boolean.class.getName(),
@@ -734,7 +693,6 @@
   */
  public MBeanParameterInfo toJMXParameterInfo()
  {
    assert debugEnter(CLASS_NAME, "toJMXParameterInfo");

    return new MBeanParameterInfo(getName(), Boolean.TYPE.getName(),
                                  getDescription());
@@ -756,7 +714,6 @@
  public void setValue(javax.management.Attribute jmxAttribute)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(jmxAttribute));

    Object value = jmxAttribute.getValue();
    if (value instanceof Boolean)
@@ -801,7 +758,6 @@
   */
  public ConfigAttribute duplicate()
  {
    assert debugEnter(CLASS_NAME, "duplicate");

    return new BooleanConfigAttribute(getName(), getDescription(),
                                      requiresAdminAction(), activeValue,

 opendj-sdk/opends/src/server/org/opends/server/config/ConfigAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -39,7 +39,6 @@
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;

@@ -52,11 +51,6 @@
 */
public abstract class ConfigAttribute
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.ConfigAttribute";



@@ -109,11 +103,6 @@
  protected ConfigAttribute(String name, String description, boolean isRequired,
                            boolean isMultiValued, boolean requiresAdminAction)
  {
    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(description),
                            String.valueOf(isRequired),
                            String.valueOf(isMultiValued),
                            String.valueOf(requiresAdminAction));


    this.name                = name;
@@ -149,16 +138,6 @@
                            boolean isMultiValued, boolean requiresAdminAction,
                            LinkedHashSet<AttributeValue> activeValues)
  {
    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(description),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(activeValues)
                            });


    this.name                = name;
@@ -212,18 +191,6 @@
                            boolean hasPendingValues,
                            LinkedHashSet<AttributeValue> pendingValues)
  {
    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(description),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(activeValues),
                              String.valueOf(hasPendingValues),
                              String.valueOf(pendingValues)
                            });


    this.name                = name;
@@ -268,7 +235,6 @@
   */
  public String getName()
  {
    assert debugEnter(CLASS_NAME, "getName");

    return name;
  }
@@ -283,7 +249,6 @@
   */
  public String getDescription()
  {
    assert debugEnter(CLASS_NAME, "getDescription");

    return description;
  }
@@ -320,7 +285,6 @@
   */
  public boolean isRequired()
  {
    assert debugEnter(CLASS_NAME, "isRequired");

    return isRequired;
  }
@@ -335,7 +299,6 @@
   */
  public boolean isMultiValued()
  {
    assert debugEnter(CLASS_NAME, "isMultiValued");

    return isMultiValued;
  }
@@ -352,7 +315,6 @@
   */
  public boolean requiresAdminAction()
  {
    assert debugEnter(CLASS_NAME, "requiresAdminAction");

    return requiresAdminAction;
  }
@@ -367,7 +329,6 @@
   */
  public LinkedHashSet<AttributeValue> getActiveValues()
  {
    assert debugEnter(CLASS_NAME, "getActiveValues");

    return activeValues;
  }
@@ -384,7 +345,6 @@
   */
  public boolean hasPendingValues()
  {
    assert debugEnter(CLASS_NAME, "hasPendingValues");

    return hasPendingValues;
  }
@@ -402,7 +362,6 @@
   */
  public LinkedHashSet<AttributeValue> getPendingValues()
  {
    assert debugEnter(CLASS_NAME, "getPendingValues");

    if (requiresAdminAction)
    {
@@ -450,7 +409,6 @@
  protected void setValues(LinkedHashSet<AttributeValue> values)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValues", String.valueOf(values));


    // If no values are provided, then check to see if this is a required
@@ -563,8 +521,6 @@
   */
  protected void setActiveValues(LinkedHashSet<AttributeValue> values)
  {
    assert debugEnter(CLASS_NAME, "setActiveValues",
                      String.valueOf(values));

    activeValues = values;
  }
@@ -580,8 +536,6 @@
   */
  protected void setPendingValues(LinkedHashSet<AttributeValue> values)
  {
    assert debugEnter(CLASS_NAME, "setPendingValues",
                      String.valueOf(values));

    pendingValues    = values;
    hasPendingValues = true;
@@ -604,7 +558,6 @@
  protected void addValues(List<AttributeValue> values)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "addValues", String.valueOf(values));


    // If there are no values provided, then do nothing.
@@ -703,7 +656,6 @@
  protected void removeValues(List<AttributeValue> values)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "removeValues", String.valueOf(values));


    // Create a temporary set of values that we will use for this change.  It
@@ -773,7 +725,6 @@
  protected void removeAllValues()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "removeAllValues");

    if (isRequired)
    {
@@ -818,7 +769,6 @@
   */
  public void setInitialValues(LinkedHashSet<AttributeValue> values)
  {
    assert debugEnter(CLASS_NAME, "setInitialValues");

    if (values == null)
    {
@@ -839,7 +789,6 @@
   */
  public void applyPendingValues()
  {
    assert debugEnter(CLASS_NAME, "applyPendingValues");

    if (hasPendingValues)
    {

 opendj-sdk/opends/src/server/org/opends/server/config/ConfigConstants.java

@@ -3885,5 +3885,27 @@
   */
  public static final String ATTR_TASK_ADDSCHEMAFILE_FILENAME =
       NAME_PREFIX_TASK + "schema-file-name";


  /**
   * The name of the attribute in a debug target configuration for a debug
   * logger that specifies the scope of the debug target.
   */
  public static final String ATTR_LOGGER_DEBUG_SCOPE =
      NAME_PREFIX_TASK + "debug-scope";

  /**
   * The name of the attribute in a logger configuration that spcifies the
   * log level.
   */
  public static final String ATTR_LOGGER_LEVEL =
      NAME_PREFIX_TASK + "log-level";

  /**
   * The name of the attribute in a logger configuration that specifies
   * whether to asyncornously writes log records to disk.
   */
  public static final String ATTR_LOGGER_ASYNC_WRITE =
      NAME_PREFIX_TASK + "async-write";
}


 opendj-sdk/opends/src/server/org/opends/server/config/ConfigEntry.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -44,9 +44,11 @@
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.StaticUtils.*;
@@ -60,11 +62,6 @@
 */
public class ConfigEntry
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.ConfigEntry";



@@ -101,8 +98,6 @@
   */
  public ConfigEntry(Entry entry, ConfigEntry parent)
  {
    assert debugConstructor(CLASS_NAME, String.valueOf(entry),
                            String.valueOf(parent));

    this.entry  = entry;
    this.parent = parent;
@@ -123,7 +118,6 @@
   */
  public Entry getEntry()
  {
    assert debugEnter(CLASS_NAME, "getEntry");

    return entry;
  }
@@ -142,7 +136,6 @@
   */
  public void setEntry(Entry entry)
  {
    assert debugEnter(CLASS_NAME, "setEntry", String.valueOf(entry));

    entryLock.lock();

@@ -165,7 +158,6 @@
   */
  public DN getDN()
  {
    assert debugEnter(CLASS_NAME, "getDN");

    return entry.getDN();
  }
@@ -184,7 +176,6 @@
   */
  public boolean hasObjectClass(String name)
  {
    assert debugEnter(CLASS_NAME, "hasObjectClass", String.valueOf(name));

    ObjectClass oc = DirectoryServer.getObjectClass(name.toLowerCase());
    if (oc == null)
@@ -215,7 +206,6 @@
  public ConfigAttribute getConfigAttribute(ConfigAttribute stub)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute", String.valueOf(stub));

    String attrName = stub.getName();
    AttributeType attrType =
@@ -246,8 +236,6 @@
   */
  public void putConfigAttribute(ConfigAttribute attribute)
  {
    assert debugEnter(CLASS_NAME, "putConfigAttribute",
                      String.valueOf(attribute));

    String name = attribute.getName();
    AttributeType attrType =
@@ -285,8 +273,6 @@
   */
  public boolean removeConfigAttribute(String lowerName)
  {
    assert debugEnter(CLASS_NAME, "removeConfigAttribute",
                      String.valueOf(lowerName));

    for (AttributeType t : entry.getUserAttributes().keySet())
    {
@@ -321,7 +307,6 @@
   */
  public ConfigEntry getParent()
  {
    assert debugEnter(CLASS_NAME, "getParent");

    return parent;
  }
@@ -336,7 +321,6 @@
   */
  public ConcurrentHashMap<DN,ConfigEntry> getChildren()
  {
    assert debugEnter(CLASS_NAME, "getChildren");

    return children;
  }
@@ -351,7 +335,6 @@
   */
  public boolean hasChildren()
  {
    assert debugEnter(CLASS_NAME, "hasChildren");

    return (! children.isEmpty());
  }
@@ -374,7 +357,6 @@
  public void addChild(ConfigEntry childEntry)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "addChild", String.valueOf(childEntry));


    ConfigEntry conflictingChild;
@@ -387,7 +369,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "addChild", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      conflictingChild = null;
    }
@@ -424,7 +409,6 @@
  public ConfigEntry removeChild(DN childDN)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "removeChild", String.valueOf(childDN));

    entryLock.lock();

@@ -456,9 +440,12 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "removeChild", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_CONFIG_ENTRY_CANNOT_REMOVE_CHILD;
      int msgID = MSGID_CONFIG_ENTRY_CANNOT_REMOVE_CHILD;
      String message = getMessage(msgID, String.valueOf(childDN),
                                  String.valueOf(entry.getDN()),
                                  stackTraceToSingleLineString(e));
@@ -486,7 +473,6 @@
   */
  public ConfigEntry duplicate()
  {
    assert debugEnter(CLASS_NAME, "duplicate");

    return new ConfigEntry(entry.duplicate(), parent);
  }
@@ -502,7 +488,6 @@
   */
  public CopyOnWriteArrayList<ConfigChangeListener> getChangeListeners()
  {
    assert debugEnter(CLASS_NAME, "getChangeListeners");

    return changeListeners;
  }
@@ -518,8 +503,6 @@
   */
  public void registerChangeListener(ConfigChangeListener listener)
  {
    assert debugEnter(CLASS_NAME, "registerChangeListener",
                      String.valueOf(listener));

    changeListeners.add(listener);
  }
@@ -537,8 +520,6 @@
   */
  public boolean deregisterChangeListener(ConfigChangeListener listener)
  {
    assert debugEnter(CLASS_NAME, "deregisterChangeListener",
                      String.valueOf(listener));

    return changeListeners.remove(listener);
  }
@@ -554,7 +535,6 @@
   */
  public CopyOnWriteArrayList<ConfigAddListener> getAddListeners()
  {
    assert debugEnter(CLASS_NAME, "getAddListeners");

    return addListeners;
  }
@@ -569,8 +549,6 @@
   */
  public void registerAddListener(ConfigAddListener listener)
  {
    assert debugEnter(CLASS_NAME, "registerAddListener",
                      String.valueOf(listener));

    addListeners.addIfAbsent(listener);
  }
@@ -586,8 +564,6 @@
   */
  public void deregisterAddListener(ConfigAddListener listener)
  {
    assert debugEnter(CLASS_NAME, "deregisterAddListener",
                      String.valueOf(listener));

    addListeners.remove(listener);
  }
@@ -603,7 +579,6 @@
   */
  public CopyOnWriteArrayList<ConfigDeleteListener> getDeleteListeners()
  {
    assert debugEnter(CLASS_NAME, "getDeleteListeners");

    return deleteListeners;
  }
@@ -618,8 +593,6 @@
   */
  public void registerDeleteListener(ConfigDeleteListener listener)
  {
    assert debugEnter(CLASS_NAME, "registerDeleteListener",
                      String.valueOf(listener));

    deleteListeners.addIfAbsent(listener);
  }
@@ -634,8 +607,6 @@
   */
  public void deregisterDeleteListener(ConfigDeleteListener listener)
  {
    assert debugEnter(CLASS_NAME, "deregisterDeleteListener",
                      String.valueOf(listener));

    deleteListeners.remove(listener);
  }

 opendj-sdk/opends/src/server/org/opends/server/config/ConfigException.java

@@ -22,13 +22,12 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;



import static org.opends.server.loggers.Debug.*;



@@ -39,11 +38,6 @@
public class ConfigException
       extends Exception
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.ConfigException";



@@ -73,8 +67,6 @@
  {
    super(message);

    assert debugConstructor(CLASS_NAME, String.valueOf(messageID),
                            String.valueOf(message));

    this.messageID = messageID;
  }
@@ -94,8 +86,6 @@
  {
    super(message, cause);

    assert debugConstructor(CLASS_NAME, String.valueOf(messageID),
                            String.valueOf(message), String.valueOf(cause));

    this.messageID = messageID;
  }
@@ -109,7 +99,6 @@
   */
  public int getMessageID()
  {
    assert debugEnter(CLASS_NAME, "getMessageID");

    return messageID;
  }

 opendj-sdk/opends/src/server/org/opends/server/config/DNConfigAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -44,10 +44,12 @@
import org.opends.server.types.DN;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -61,11 +63,6 @@
public class DNConfigAttribute
       extends ConfigAttribute
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.DNConfigAttribute";



@@ -98,11 +95,6 @@
  {
    super(name, description, isRequired, isMultiValued, requiresAdminAction);

    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(isRequired),
                            String.valueOf(isMultiValued),
                            String.valueOf(description),
                            String.valueOf(requiresAdminAction));

    activeValues  = new ArrayList<DN>();
    pendingValues = activeValues;
@@ -133,16 +125,6 @@
    super(name, description, isRequired, isMultiValued, requiresAdminAction,
          getValueSet(value));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(value)
                            });

    if (value == null)
    {
@@ -183,16 +165,6 @@
    super(name, description, isRequired, isMultiValued, requiresAdminAction,
          getValueSet(values));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(values)
                            });

    if (values == null)
    {
@@ -235,17 +207,6 @@
          getValueSet(activeValues), (pendingValues != null),
          getValueSet(pendingValues));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(activeValues),
                              String.valueOf(pendingValues)
                            });

    if (activeValues == null)
    {
@@ -278,7 +239,6 @@
   */
  public String getDataType()
  {
    assert debugEnter(CLASS_NAME, "getDataType");

    return "DN";
  }
@@ -292,7 +252,6 @@
   */
  public AttributeSyntax getSyntax()
  {
    assert debugEnter(CLASS_NAME,"getSyntax");

    return DirectoryServer.getDefaultStringSyntax();
  }
@@ -311,7 +270,6 @@
  public DN activeValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "activeValue");

    if ((activeValues == null) || activeValues.isEmpty())
    {
@@ -339,7 +297,6 @@
   */
  public List<DN> activeValues()
  {
    assert debugEnter(CLASS_NAME, "activeValues");

    return activeValues;
  }
@@ -360,7 +317,6 @@
  public DN pendingValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "pendingValue");

    if (! hasPendingValues())
    {
@@ -395,7 +351,6 @@
   */
  public List<DN> pendingValues()
  {
    assert debugEnter(CLASS_NAME, "pendingValues");

    if (! hasPendingValues())
    {
@@ -417,7 +372,6 @@
  public void setValue(DN value)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(value));

    if (value == null)
    {
@@ -454,7 +408,6 @@
  public void setValues(List<DN> values)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValues", String.valueOf(values));


    // First check if the set is empty and if that is allowed.
@@ -545,7 +498,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(DN value)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(value));

    LinkedHashSet<AttributeValue> valueSet;
    if (value == null)
@@ -573,7 +525,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(List<DN> values)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(values));

    if (values == null)
    {
@@ -601,7 +552,6 @@
   */
  public void applyPendingValues()
  {
    assert debugEnter(CLASS_NAME, "applyPendingValues");

    if (! hasPendingValues())
    {
@@ -629,8 +579,6 @@
  public boolean valueIsAcceptable(AttributeValue value,
                                   StringBuilder rejectReason)
  {
    assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
                      "java.lang.StringBuilder");


    // Make sure that the value is not null.
@@ -648,7 +596,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "valueIsAcceptable", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      rejectReason.append(getMessage(MSGID_CONFIG_ATTR_DN_CANNOT_PARSE,
                                     value.getStringValue(), getName(),
@@ -686,9 +637,6 @@
                              boolean allowFailures)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "stringsToValues",
                      String.valueOf(valueStrings),
                      String.valueOf(allowFailures));

    if ((valueStrings == null) || valueStrings.isEmpty())
    {
@@ -743,7 +691,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "stringsToValues", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_CONFIG_ATTR_DN_CANNOT_PARSE;
        String message = getMessage(msgID, valueString, getName(),
@@ -795,7 +746,6 @@
   */
  public List<String> activeValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "activeValuesToStrings");

    ArrayList<String> valueStrings = new ArrayList<String>(activeValues.size());
    for (DN dn : activeValues)
@@ -821,7 +771,6 @@
   */
  public List<String> pendingValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "pendingValuesToStrings");

    if (hasPendingValues())
    {
@@ -866,8 +815,6 @@
  public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute",
                      String.valueOf(attributeList));


    ArrayList<DN> activeValues  = null;
@@ -926,7 +873,10 @@
              }
              catch (Exception e)
              {
                assert debugException(CLASS_NAME, "getConfigAttribute", e);
                if (debugEnabled())
                {
                  debugCought(DebugLogLevel.ERROR, e);
                }

                int msgID = MSGID_CONFIG_ATTR_DN_CANNOT_PARSE;
                String message = getMessage(msgID, v.getStringValue(),
@@ -996,7 +946,10 @@
            }
            catch (Exception e)
            {
              assert debugException(CLASS_NAME, "getConfigAttribute", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }

              int msgID = MSGID_CONFIG_ATTR_DN_CANNOT_PARSE;
              String message = getMessage(msgID, v.getStringValue(), getName(),
@@ -1043,7 +996,6 @@
   */
  private javax.management.Attribute _toJMXAttribute(boolean pending)
  {
    assert debugEnter(CLASS_NAME, "_toJMXAttribute");

    List<DN> requestedValues ;
    String name ;
@@ -1120,8 +1072,6 @@
   */
  public void toJMXAttribute(AttributeList attributeList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute",
                      String.valueOf(attributeList));

    if (activeValues.size() > 0)
    {
@@ -1194,8 +1144,6 @@
   */
  public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
                      String.valueOf(attributeInfoList));


    if (isMultiValued())
@@ -1246,7 +1194,6 @@
   */
  public MBeanParameterInfo toJMXParameterInfo()
  {
    assert debugEnter(CLASS_NAME, "toJMXParameterInfo");

    if (isMultiValued())
    {
@@ -1276,7 +1223,6 @@
  public void setValue(javax.management.Attribute jmxAttribute)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(jmxAttribute));

    Object value = jmxAttribute.getValue();
    if (value == null)
@@ -1298,7 +1244,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "setValue", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_CONFIG_ATTR_DN_CANNOT_PARSE;
        String message = getMessage(msgID, (String) value, getName(),
@@ -1340,7 +1289,10 @@
            }
            catch (Exception e)
            {
              assert debugException(CLASS_NAME, "setValue", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }

              int    msgID   = MSGID_CONFIG_ATTR_DN_CANNOT_PARSE;
              String message = getMessage(msgID, valueStr, getName(),
@@ -1355,13 +1307,19 @@
        }
        catch (ConfigException ce)
        {
          assert debugException(CLASS_NAME, "setValue", ce);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, ce);
          }

          throw ce;
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "setValue", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int msgID = MSGID_CONFIG_ATTR_INVALID_DN_VALUE;
          String message = getMessage(msgID, getName(), String.valueOf(value),
@@ -1394,7 +1352,6 @@
   */
  public ConfigAttribute duplicate()
  {
    assert debugEnter(CLASS_NAME, "duplicate");

    return new DNConfigAttribute(getName(), getDescription(), isRequired(),
                                 isMultiValued(), requiresAdminAction(),

 opendj-sdk/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -43,10 +43,12 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -62,11 +64,6 @@
public class IntegerConfigAttribute
       extends ConfigAttribute
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.IntegerConfigAttribute";



@@ -122,19 +119,6 @@
  {
    super(name, description, isRequired, isMultiValued, requiresAdminAction);

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(hasLowerBound),
                              String.valueOf(lowerBound),
                              String.valueOf(hasUpperBound),
                              String.valueOf(upperBound)
                            });

    this.hasLowerBound = hasLowerBound;
    this.lowerBound    = lowerBound;
@@ -182,20 +166,6 @@
    super(name, description, isRequired, isMultiValued, requiresAdminAction,
          getValueSet(value));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(hasLowerBound),
                              String.valueOf(lowerBound),
                              String.valueOf(hasUpperBound),
                              String.valueOf(upperBound),
                              String.valueOf(value)
                            });

    this.hasLowerBound = hasLowerBound;
    this.lowerBound    = lowerBound;
@@ -245,20 +215,6 @@
    super(name, description, isRequired, isMultiValued, requiresAdminAction,
          getValueSet(values));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(hasLowerBound),
                              String.valueOf(lowerBound),
                              String.valueOf(hasUpperBound),
                              String.valueOf(upperBound),
                              String.valueOf(values)
                            });

    this.hasLowerBound = hasLowerBound;
    this.lowerBound    = lowerBound;
@@ -318,21 +274,6 @@
          getValueSet(activeValues), (pendingValues != null),
          getValueSet(pendingValues));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(hasLowerBound),
                              String.valueOf(lowerBound),
                              String.valueOf(hasUpperBound),
                              String.valueOf(upperBound),
                              String.valueOf(activeValues),
                              String.valueOf(pendingValues)
                            });

    this.hasLowerBound = hasLowerBound;
    this.lowerBound    = lowerBound;
@@ -370,7 +311,6 @@
   */
  public String getDataType()
  {
    assert debugEnter(CLASS_NAME, "getDataType");

    return "Integer";
  }
@@ -384,7 +324,6 @@
   */
  public AttributeSyntax getSyntax()
  {
    assert debugEnter(CLASS_NAME, "getSyntax");

    return DirectoryServer.getDefaultIntegerSyntax();
  }
@@ -403,7 +342,6 @@
  public long activeValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "activeValue");

    if ((activeValues == null) || activeValues.isEmpty())
    {
@@ -439,7 +377,6 @@
  public int activeIntValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "activeIntValue");

    if ((activeValues == null) || activeValues.isEmpty())
    {
@@ -478,7 +415,6 @@
   */
  public List<Long> activeValues()
  {
    assert debugEnter(CLASS_NAME, "activeValues");

    return activeValues;
  }
@@ -499,7 +435,6 @@
  public long pendingValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "pendingValue");

    if (! hasPendingValues())
    {
@@ -541,7 +476,6 @@
  public int pendingIntValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "pendingIntValue");

    if (! hasPendingValues())
    {
@@ -587,7 +521,6 @@
   */
  public List<Long> pendingValues()
  {
    assert debugEnter(CLASS_NAME, "pendingValues");

    if (! hasPendingValues())
    {
@@ -609,7 +542,6 @@
   */
  public boolean hasLowerBound()
  {
    assert debugEnter(CLASS_NAME, "hasLowerBound");

    return hasLowerBound;
  }
@@ -623,7 +555,6 @@
   */
  public long getLowerBound()
  {
    assert debugEnter(CLASS_NAME, "getLowerBound");

    return lowerBound;
  }
@@ -640,7 +571,6 @@
   */
  public boolean hasUpperBound()
  {
    assert debugEnter(CLASS_NAME, "hasUpperBound");

    return hasUpperBound;
  }
@@ -656,7 +586,6 @@
   */
  public long getUpperBound()
  {
    assert debugEnter(CLASS_NAME, "getUpperBound");

    return upperBound;
  }
@@ -673,7 +602,6 @@
  public void setValue(long value)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(value));

    if (hasLowerBound && (value < lowerBound))
    {
@@ -717,7 +645,6 @@
  public void setValues(List<Long> values)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValues", String.valueOf(values));


    // First check if the set is empty and if that is allowed.
@@ -816,7 +743,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(long value)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(value));

    LinkedHashSet<AttributeValue> valueSet =
         new LinkedHashSet<AttributeValue>(1);
@@ -839,7 +765,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(List<Long> values)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(values));

    if (values == null)
    {
@@ -868,7 +793,6 @@
   */
  public void applyPendingValues()
  {
    assert debugEnter(CLASS_NAME, "applyPendingValues");

    if (! hasPendingValues())
    {
@@ -896,8 +820,6 @@
  public boolean valueIsAcceptable(AttributeValue value,
                                   StringBuilder rejectReason)
  {
    assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
                      "java.lang.StringBuilder");


    // First, make sure we can represent it as a long.
@@ -909,7 +831,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "valueIsAcceptable", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      rejectReason.append(getMessage(MSGID_CONFIG_ATTR_INVALID_INT_VALUE,
                                     stringValue, String.valueOf(e)));
@@ -963,9 +888,6 @@
                              boolean allowFailures)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "stringsToValues",
                      String.valueOf(valueStrings),
                      String.valueOf(allowFailures));

    if ((valueStrings == null) || valueStrings.isEmpty())
    {
@@ -1002,7 +924,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "stringsToValues", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_CONFIG_ATTR_INT_COULD_NOT_PARSE;
        String message = getMessage(msgID, valueString, getName(),
@@ -1090,7 +1015,6 @@
   */
  public List<String> activeValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "activeValuesToStrings");

    ArrayList<String> valueStrings =
         new ArrayList<String>(activeValues.size());
@@ -1117,7 +1041,6 @@
   */
  public List<String> pendingValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "pendingValuesToStrings");

    if (hasPendingValues())
    {
@@ -1162,8 +1085,6 @@
  public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute",
                      String.valueOf(attributeList));


    ArrayList<Long> activeValues  = null;
@@ -1373,7 +1294,6 @@
   */
  private javax.management.Attribute _toJMXAttribute(boolean pending)
  {
    assert debugEnter(CLASS_NAME, "_toJMXAttribute");
    List<Long> requestedValues ;
    String name ;
    if (pending)
@@ -1421,7 +1341,6 @@
   */
  public javax.management.Attribute toJMXAttribute()
    {
        assert debugEnter(CLASS_NAME, "toJMXAttribute");

        return _toJMXAttribute(false);
    }
@@ -1435,7 +1354,6 @@
   */
  public  javax.management.Attribute toJMXAttributePending()
  {
      assert debugEnter(CLASS_NAME, "toJMXAttributePending");

      return _toJMXAttribute(true);
  }
@@ -1455,8 +1373,6 @@
   */
  public void toJMXAttribute(AttributeList attributeList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute",
                      String.valueOf(attributeList));

    if (activeValues.size() > 0)
    {
@@ -1529,8 +1445,6 @@
   */
  public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
                      String.valueOf(attributeInfoList));


    if (isMultiValued())
@@ -1579,7 +1493,6 @@
   */
  public MBeanParameterInfo toJMXParameterInfo()
  {
    assert debugEnter(CLASS_NAME, "toJMXParameterInfo");

    if (isMultiValued())
    {
@@ -1609,7 +1522,6 @@
  public void setValue(javax.management.Attribute jmxAttribute)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(jmxAttribute));

    Object value = jmxAttribute.getValue();
    if (value instanceof Long)
@@ -1628,7 +1540,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "setValue", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_CONFIG_ATTR_INT_COULD_NOT_PARSE;
        String message = getMessage(msgID, String.valueOf(value), getName(),
@@ -1686,13 +1601,19 @@
      }
      catch (ConfigException ce)
      {
        assert debugException(CLASS_NAME, "setValue", ce);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, ce);
        }

        throw ce;
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "setValue", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        int    msgID   = MSGID_CONFIG_ATTR_INT_COULD_NOT_PARSE;
        String message = getMessage(msgID, componentType + "[" + length + "]",
@@ -1718,7 +1639,6 @@
   */
  public ConfigAttribute duplicate()
  {
    assert debugEnter(CLASS_NAME, "duplicate");

    return new IntegerConfigAttribute(getName(), getDescription(), isRequired(),
                                      isMultiValued(), requiresAdminAction(),

 opendj-sdk/opends/src/server/org/opends/server/config/IntegerWithUnitConfigAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -44,9 +44,11 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
@@ -70,11 +72,6 @@
public class IntegerWithUnitConfigAttribute
       extends ConfigAttribute
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.IntegerWithUnitConfigAttribute";



@@ -144,18 +141,6 @@
  {
    super(name, description, true, false, requiresAdminAction);

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(units),
                              String.valueOf(hasLowerBound),
                              String.valueOf(lowerBound),
                              String.valueOf(hasUpperBound),
                              String.valueOf(upperBound)
                            });

    this.units         = units;
    this.hasLowerBound = hasLowerBound;
@@ -200,20 +185,6 @@
    super(name, description, true, false, requiresAdminAction,
          getValueSet(intValue, selectedUnit));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(units),
                              String.valueOf(hasLowerBound),
                              String.valueOf(lowerBound),
                              String.valueOf(hasUpperBound),
                              String.valueOf(upperBound),
                              String.valueOf(intValue),
                              String.valueOf(selectedUnit),
                            });


    this.units          = units;
@@ -280,22 +251,6 @@
          (pendingSelectedUnit != null),
          getValueSet(pendingIntValue,pendingSelectedUnit));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(units),
                              String.valueOf(hasLowerBound),
                              String.valueOf(lowerBound),
                              String.valueOf(hasUpperBound),
                              String.valueOf(upperBound),
                              String.valueOf(activeIntValue),
                              String.valueOf(activeSelectedUnit),
                              String.valueOf(pendingIntValue),
                              String.valueOf(pendingSelectedUnit)
                            });


    this.units          = units;
@@ -341,7 +296,6 @@
   */
  public String getDataType()
  {
    assert debugEnter(CLASS_NAME, "getDataType");

    return "IntegerWithUnit";
  }
@@ -355,7 +309,6 @@
   */
  public AttributeSyntax getSyntax()
  {
    assert debugEnter(CLASS_NAME, "getSyntax");

    return DirectoryServer.getDefaultStringSyntax();
  }
@@ -371,7 +324,6 @@
   */
  public long activeIntValue()
  {
    assert debugEnter(CLASS_NAME, "activeIntValue");

    return activeIntValue;
  }
@@ -385,7 +337,6 @@
   */
  public String activeUnit()
  {
    assert debugEnter(CLASS_NAME, "activeUnit");

    return activeUnit;
  }
@@ -401,7 +352,6 @@
   */
  public long activeCalculatedValue()
  {
    assert debugEnter(CLASS_NAME, "activeCalculatedValue");

    return activeCalculatedValue;
  }
@@ -418,7 +368,6 @@
   */
  public long pendingIntValue()
  {
    assert debugEnter(CLASS_NAME, "pendingIntValue");

    if (hasPendingValues())
    {
@@ -441,7 +390,6 @@
   */
  public String pendingUnit()
  {
    assert debugEnter(CLASS_NAME, "pendingUnit");

    if (hasPendingValues())
    {
@@ -465,7 +413,6 @@
   */
  public long pendingCalculatedValue()
  {
    assert debugEnter(CLASS_NAME, "pendingCalculatedValue");

    if (hasPendingValues())
    {
@@ -488,7 +435,6 @@
   */
  public HashMap<String,Double> getUnits()
  {
    assert debugEnter(CLASS_NAME, "getUnits");

    return units;
  }
@@ -505,7 +451,6 @@
   */
  public boolean hasLowerBound()
  {
    assert debugEnter(CLASS_NAME, "hasLowerBound");

    return hasLowerBound;
  }
@@ -521,7 +466,6 @@
   */
  public long getLowerBound()
  {
    assert debugEnter(CLASS_NAME, "getLowerBound");

    return lowerBound;
  }
@@ -538,7 +482,6 @@
   */
  public boolean hasUpperBound()
  {
    assert debugEnter(CLASS_NAME, "hasUpperBound");

    return hasUpperBound;
  }
@@ -554,7 +497,6 @@
   */
  public long getUpperBound()
  {
    assert debugEnter(CLASS_NAME, "getUpperBound");

    return upperBound;
  }
@@ -575,8 +517,6 @@
  public void setValue(long intValue, String unit)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(intValue),
                      String.valueOf(unit));

    if ((unit == null) || (! units.containsKey(unit)))
    {
@@ -633,7 +573,6 @@
  public void setValue(String value)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(value));

    int spacePos = value.indexOf(' ');
    if (spacePos <= 0)
@@ -651,7 +590,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "setValue", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT;
      String message = getMessage(msgID, String.valueOf(value), getName(),
@@ -675,8 +617,6 @@
  private static LinkedHashSet<AttributeValue> getValueSet(long intValue,
                                                           String unit)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(intValue),
                      String.valueOf(unit));

    if (unit == null)
    {
@@ -702,7 +642,6 @@
   */
  public void applyPendingValues()
  {
    assert debugEnter(CLASS_NAME, "applyPendingValues");

    if (! hasPendingValues())
    {
@@ -732,8 +671,6 @@
  public boolean valueIsAcceptable(AttributeValue value,
                                   StringBuilder rejectReason)
  {
    assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
                      "java.lang.StringBuilder");


    // Get a string representation of the value and convert it to lowercase.
@@ -760,8 +697,6 @@
  public boolean valueIsAcceptable(String lowerValue,
                                   StringBuilder rejectReason)
  {
    assert debugEnter(CLASS_NAME, "valueIsAcceptable",
                      String.valueOf(lowerValue), "java.lang.StringBuilder");


    // Find the first space in the value, since it should separate the integer
@@ -783,7 +718,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "valueIsAcceptable", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      rejectReason.append(getMessage(MSGID_CONFIG_ATTR_INT_COULD_NOT_PARSE,
                                     lowerValue, getName(), String.valueOf(e)));
@@ -854,9 +792,6 @@
              stringsToValues(List<String> valueStrings, boolean allowFailures)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "stringsToValues",
                      String.valueOf(valueStrings),
                      String.valueOf(allowFailures));

    if ((valueStrings == null) || valueStrings.isEmpty())
    {
@@ -957,7 +892,6 @@
   */
  public List<String> activeValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "activeValuesToStrings");

    ArrayList<String> valueStrings = new ArrayList<String>(1);
    valueStrings.add(activeIntValue + " " + activeUnit);
@@ -980,7 +914,6 @@
   */
  public List<String> pendingValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "pendingValuesToStrings");

    if (hasPendingValues())
    {
@@ -1021,8 +954,6 @@
  public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute",
                      String.valueOf(attributeList));


    long   activeIntValue  = 0;
@@ -1242,7 +1173,6 @@
   */
  public javax.management.Attribute toJMXAttribute()
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute");

    return new javax.management.Attribute(getName(),
                                          activeIntValue + " " + activeUnit);
@@ -1258,7 +1188,6 @@
   */
  public javax.management.Attribute toJMXAttributePending()
    {
        assert debugEnter(CLASS_NAME, "toJMXAttributePending");

        return new javax.management.Attribute(getName() + ";"
                + OPTION_PENDING_VALUES, pendingIntValue + " " + pendingUnit);
@@ -1279,8 +1208,6 @@
     */
  public void toJMXAttribute(AttributeList attributeList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute",
                      String.valueOf(attributeList));

    String activeValue = activeIntValue + " " + activeUnit;
    attributeList.add(new javax.management.Attribute(getName(), activeValue));
@@ -1310,8 +1237,6 @@
   */
  public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
                      String.valueOf(attributeInfoList));

    attributeInfoList.add(new MBeanAttributeInfo(getName(),
                                                 String.class.getName(),
@@ -1339,7 +1264,6 @@
   */
  public MBeanParameterInfo toJMXParameterInfo()
  {
    assert debugEnter(CLASS_NAME, "toJMXParameterInfo");

    return new MBeanParameterInfo(getName(), String.class.getName(),
                                  getDescription());
@@ -1361,7 +1285,6 @@
  public void setValue(javax.management.Attribute jmxAttribute)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(jmxAttribute));

    Object value = jmxAttribute.getValue();
    if (value instanceof String)
@@ -1386,7 +1309,6 @@
   */
  public ConfigAttribute duplicate()
  {
    assert debugEnter(CLASS_NAME, "duplicate");

    return new IntegerWithUnitConfigAttribute(getName(), getDescription(),
                                              requiresAdminAction(), units,

 opendj-sdk/opends/src/server/org/opends/server/config/JMXMBean.java

@@ -64,8 +64,10 @@
import org.opends.server.types.InvokableMethod;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchScope;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
@@ -94,7 +96,7 @@
       implements DynamicMBean, DirectoryServerMBean
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   * The fully-qualified name of this class.
   */
  private static final String CLASS_NAME = "org.opends.server.config.JMXMBean";

@@ -169,7 +171,10 @@
          nameStr = MBEAN_BASE_DOMAIN + ":" + "Name=rootDSE" + typeStr;
      } catch (Exception e)
      {
          assert debugException(CLASS_NAME, "<init>", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

          int msgID = MSGID_CONFIG_JMX_CANNOT_REGISTER_MBEAN;
          String message = getMessage(msgID, configEntryDN.toString(),
@@ -188,7 +193,6 @@
   */
  public JMXMBean(DN configEntryDN)
    {
        assert debugConstructor(CLASS_NAME);

        this.configEntryDN = configEntryDN;

@@ -213,14 +217,20 @@
                  }
                } catch(Exception e)
                {
                  assert debugException(CLASS_NAME, "<init>", e);
                  if (debugEnabled())
                  {
                    debugCought(DebugLogLevel.ERROR, e);
                  }
                }

                mBeanServer.registerMBean(this, objectName);

            } catch (Exception e)
            {
                assert debugException(CLASS_NAME, "<init>", e);
              if (debugEnabled())
              {
                debugCought(DebugLogLevel.ERROR, e);
              }
                e.printStackTrace();

                int msgID = MSGID_CONFIG_JMX_CANNOT_REGISTER_MBEAN;
@@ -241,7 +251,6 @@
   */
  public ObjectName getObjectName()
  {
    assert debugEnter(CLASS_NAME, "getObjectName");

    return objectName;
  }
@@ -255,7 +264,6 @@
   */
  public CopyOnWriteArrayList<AlertGenerator> getAlertGenerators()
  {
    assert debugEnter(CLASS_NAME, "getAlertGenerators");

    return alertGenerators;
  }
@@ -271,8 +279,6 @@
   */
  public void addAlertGenerator(AlertGenerator generator)
  {
    assert debugEnter(CLASS_NAME, "addAlertGenerator",
                      String.valueOf(generator));

    synchronized (alertGenerators)
    {
@@ -297,8 +303,6 @@
   */
  public boolean removeAlertGenerator(AlertGenerator generator)
  {
    assert debugEnter(CLASS_NAME, "removeAlertGenerator",
                      String.valueOf(generator));

    synchronized (alertGenerators)
    {
@@ -316,7 +320,6 @@
   */
  public CopyOnWriteArrayList<ConfigurableComponent> getConfigurableComponents()
  {
    assert debugEnter(CLASS_NAME, "getConfigurableComponents");

    return configurableComponents;
  }
@@ -332,8 +335,6 @@
   */
  public void addConfigurableComponent(ConfigurableComponent component)
  {
    assert debugEnter(CLASS_NAME, "addConfigurableComponent",
                      String.valueOf(component));

    synchronized (configurableComponents)
    {
@@ -358,8 +359,6 @@
   */
  public boolean removeConfigurableComponent(ConfigurableComponent component)
  {
    assert debugEnter(CLASS_NAME, "removeConfigurableComponent",
                      String.valueOf(component));

    synchronized (configurableComponents)
    {
@@ -376,7 +375,6 @@
   */
  public CopyOnWriteArrayList<InvokableComponent> getInvokableComponents()
  {
    assert debugEnter(CLASS_NAME, "getInvokableComponents");

    return invokableComponents;
  }
@@ -392,8 +390,6 @@
   */
  public void addInvokableComponent(InvokableComponent component)
  {
    assert debugEnter(CLASS_NAME, "addInvokableComponent",
                      String.valueOf(component));

    synchronized (invokableComponents)
    {
@@ -418,8 +414,6 @@
   */
  public boolean removeInvokableComponent(InvokableComponent component)
  {
    assert debugEnter(CLASS_NAME, "removeInvokableComponent",
                      String.valueOf(component));

    synchronized (invokableComponents)
    {
@@ -436,7 +430,6 @@
   */
  public CopyOnWriteArrayList<MonitorProvider> getMonitorProviders()
  {
    assert debugEnter(CLASS_NAME, "getMonitorProviders");

    return monitorProviders;
  }
@@ -452,8 +445,6 @@
   */
  public void addMonitorProvider(MonitorProvider component)
  {
    assert debugEnter(CLASS_NAME, "addMonitorProvider",
                      String.valueOf(component));

    synchronized (monitorProviders)
    {
@@ -478,8 +469,6 @@
   */
  public boolean removeMonitorProvider(MonitorProvider component)
  {
    assert debugEnter(CLASS_NAME, "removeMonitorProvider",
                      String.valueOf(component));

    synchronized (monitorProviders)
    {
@@ -499,8 +488,6 @@
   */
  private ConfigAttribute getConfigAttribute(String name)
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute",
                      String.valueOf(name));

    for (ConfigurableComponent component : configurableComponents)
    {
@@ -528,7 +515,6 @@
   */
  private Attribute getJmxAttribute(String name)
  {
    assert debugEnter(CLASS_NAME, "getJmxAttribute", String.valueOf(name));

    String attributeName ;
    String pendingString = ";" + OPTION_PENDING_VALUES ;
@@ -627,7 +613,6 @@
  public Attribute getAttribute(String attributeName)
         throws AttributeNotFoundException
  {
    assert debugEnter(CLASS_NAME, "getAttribute");

    //
    // Get the jmx Client connection
@@ -647,7 +632,10 @@
    }
    catch (LDAPException e)
    {
      assert debugException(CLASS_NAME, "getAttribute", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_CONFIG_JMX_CANNOT_GET_ATTRIBUTE;
      String message = getMessage(msgID, String.valueOf(attributeName),
@@ -682,7 +670,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "setAttribute", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_CONFIG_JMX_ATTR_NO_ATTR;
      String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -712,8 +703,6 @@
      javax.management.Attribute attribute, ConfigEntry configEntry)
      throws AttributeNotFoundException, InvalidAttributeValueException
  {
    assert debugEnter(CLASS_NAME, "getLdapAttributeFromJmx", String
        .valueOf(attribute));

    String name = attribute.getName() ;
    //
@@ -725,7 +714,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "setAttribute", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_CONFIG_JMX_ATTR_NO_ATTR;
      String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -745,7 +737,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "setAttribute", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }
      logError(
          ErrorLogCategory.CONFIGURATION,
          ErrorLogSeverity.MILD_ERROR,
@@ -788,7 +783,6 @@
  public void setAttribute(javax.management.Attribute attribute)
         throws AttributeNotFoundException, InvalidAttributeValueException
  {
    assert debugEnter(CLASS_NAME, "setAttribute", String.valueOf(attribute));

    ConfigEntry configEntry;
    ConfigEntry newConfigEntry ;
@@ -802,7 +796,10 @@
      newConfigEntry = configEntry.duplicate();
    } catch (Exception e)
    {
      assert debugException(CLASS_NAME, "setAttribute", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_CONFIG_JMX_CANNOT_GET_CONFIG_ENTRY;
      String message = getMessage(msgID, String.valueOf(configEntryDN),
@@ -861,7 +858,6 @@
   */
  public AttributeList getAttributes(String[] attributes)
    {
    assert debugEnter(CLASS_NAME, "getAttributes", String.valueOf(attributes));

    //
    // Get the jmx Client connection
@@ -913,7 +909,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "getAttributes", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }

      // It's possible that this is a monitor attribute rather than a
@@ -981,7 +980,6 @@
   */
  public AttributeList setAttributes(AttributeList attributes)
  {
    assert debugEnter(CLASS_NAME, "setAttributes", String.valueOf(attributes));

    AttributeList setAttrs = new AttributeList();

@@ -998,7 +996,10 @@
      newConfigEntry = configEntry.duplicate();
    } catch (Exception e)
    {
      assert debugException(CLASS_NAME, "setAttribute", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      logError(
          ErrorLogCategory.CONFIGURATION,
@@ -1057,8 +1058,10 @@
      }
      catch (Exception e)
      {
        assert debugException(
            CLASS_NAME, "setAttribute", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }

        logError(ErrorLogCategory.CONFIGURATION, ErrorLogSeverity.MILD_ERROR,
                 MSGID_CONFIG_JMX_ATTR_NO_ATTR, configEntryDN.toString(),
@@ -1092,8 +1095,6 @@
  public Object invoke(String actionName, Object[] params, String[] signature)
         throws MBeanException
  {
    assert debugEnter(CLASS_NAME, "invoke", String.valueOf(actionName),
                      String.valueOf(params), String.valueOf(signature));

    for (InvokableComponent component : invokableComponents)
    {
@@ -1107,13 +1108,19 @@
          }
          catch (MBeanException me)
          {
            assert debugException(CLASS_NAME, "invoke", me);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, me);
            }

            throw me;
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "invoke", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            throw new MBeanException(e);
          }
@@ -1160,7 +1167,6 @@
   */
  public MBeanInfo getMBeanInfo()
  {
    assert debugEnter(CLASS_NAME, "getMBeanInfo");
    JmxClientConnection jmxClientConnection = getClientConnection();
    if (jmxClientConnection == null)
    {

 opendj-sdk/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -44,9 +44,11 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
@@ -62,11 +64,6 @@
public class MultiChoiceConfigAttribute
       extends ConfigAttribute
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.MultiChoiceConfigAttribute";



@@ -108,16 +105,6 @@
  {
    super(name, description, isRequired, isMultiValued, requiresAdminAction);

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(allowedValues)
                            });

    this.allowedValues = allowedValues;

@@ -156,17 +143,6 @@
    super(name, description, isRequired, isMultiValued, requiresAdminAction,
          getValueSet(value));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(allowedValues),
                              String.valueOf(value)
                            });

    this.allowedValues = allowedValues;

@@ -215,17 +191,6 @@
    super(name, description, isRequired, isMultiValued, requiresAdminAction,
          getValueSet(values));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(allowedValues),
                              String.valueOf(values)
                            });

    this.allowedValues = allowedValues;

@@ -277,18 +242,6 @@
          getValueSet(activeValues), (pendingValues != null),
          getValueSet(pendingValues));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(allowedValues),
                              String.valueOf(activeValues),
                              String.valueOf(pendingValues)
                            });

    this.allowedValues = allowedValues;

@@ -323,7 +276,6 @@
   */
  public String getDataType()
  {
    assert debugEnter(CLASS_NAME, "getDataType");

    return "MultiChoice";
  }
@@ -337,7 +289,6 @@
   */
  public AttributeSyntax getSyntax()
  {
    assert debugEnter(CLASS_NAME, "getSyntax");

    return DirectoryServer.getDefaultStringSyntax();
  }
@@ -356,7 +307,6 @@
  public String activeValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "activeValue");

    if ((activeValues == null) || activeValues.isEmpty())
    {
@@ -384,7 +334,6 @@
   */
  public List<String> activeValues()
  {
    assert debugEnter(CLASS_NAME, "activeValues");

    return activeValues;
  }
@@ -405,7 +354,6 @@
  public String pendingValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "pendingValue");

    if (! hasPendingValues())
    {
@@ -440,7 +388,6 @@
   */
  public List<String> pendingValues()
  {
    assert debugEnter(CLASS_NAME, "pendingValues");

    if (! hasPendingValues())
    {
@@ -461,7 +408,6 @@
   */
  public Set<String> allowedValues()
  {
    assert debugEnter(CLASS_NAME, "getAllowedValues");

    return allowedValues;
  }
@@ -478,7 +424,6 @@
  public void setValue(String value)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(value));

    if ((value == null) || (value.length() == 0))
    {
@@ -522,7 +467,6 @@
  public void setValues(List<String> values)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValues", String.valueOf(values));


    // First check if the set is empty and if that is allowed.
@@ -621,7 +565,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(String value)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(value));

    LinkedHashSet<AttributeValue> valueSet =
         new LinkedHashSet<AttributeValue>(1);
@@ -643,7 +586,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(List<String> values)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(values));

    if (values == null)
    {
@@ -671,7 +613,6 @@
   */
  public void applyPendingValues()
  {
    assert debugEnter(CLASS_NAME, "applyPendingValues");

    if (! hasPendingValues())
    {
@@ -699,8 +640,6 @@
  public boolean valueIsAcceptable(AttributeValue value,
                                   StringBuilder rejectReason)
  {
    assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
                      "java.lang.StringBuilder");


    // Make sure that the value is non-empty.
@@ -752,9 +691,6 @@
                              boolean allowFailures)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "stringsToValues",
                      String.valueOf(valueStrings),
                      String.valueOf(allowFailures));

    if ((valueStrings == null) || valueStrings.isEmpty())
    {
@@ -851,7 +787,6 @@
   */
  public List<String> activeValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "activeValuesToStrings");

    return activeValues;
  }
@@ -871,7 +806,6 @@
   */
  public List<String> pendingValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "pendingValuesToStrings");

    if (hasPendingValues())
    {
@@ -909,8 +843,6 @@
  public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute",
                      String.valueOf(attributeList));


    ArrayList<String> activeValues  = null;
@@ -1077,7 +1009,6 @@
   */
  private javax.management.Attribute _toJMXAttribute(boolean pending)
  {
    assert debugEnter(CLASS_NAME, "_toJMXAttribute");

    List<String> requestedValues ;
    String name ;
@@ -1122,7 +1053,6 @@
   */
  public javax.management.Attribute toJMXAttribute()
  {
      assert debugEnter(CLASS_NAME, "toJMXAttribute");
      return _toJMXAttribute(false) ;
  }

@@ -1136,7 +1066,6 @@
   */
  public javax.management.Attribute toJMXAttributePending()
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributePending");

    return _toJMXAttribute(true) ;
  }
@@ -1155,8 +1084,6 @@
   */
  public void toJMXAttribute(AttributeList attributeList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute",
                      String.valueOf(attributeList));

    if (activeValues.size() > 0)
    {
@@ -1223,8 +1150,6 @@
   */
  public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
                      String.valueOf(attributeInfoList));


    if (isMultiValued())
@@ -1275,7 +1200,6 @@
   */
  public MBeanParameterInfo toJMXParameterInfo()
  {
    assert debugEnter(CLASS_NAME, "toJMXParameterInfo");

    if (isMultiValued())
    {
@@ -1305,7 +1229,6 @@
  public void setValue(javax.management.Attribute jmxAttribute)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(jmxAttribute));

    Object value = jmxAttribute.getValue();
    if (value instanceof String)
@@ -1332,13 +1255,19 @@
        }
        catch (ConfigException ce)
        {
          assert debugException(CLASS_NAME, "setValue", ce);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, ce);
          }

          throw ce;
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "setValue", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int msgID = MSGID_CONFIG_ATTR_INVALID_STRING_VALUE;
          String message = getMessage(msgID, getName(), String.valueOf(value),
@@ -1371,7 +1300,6 @@
   */
  public ConfigAttribute duplicate()
  {
    assert debugEnter(CLASS_NAME, "duplicate");

    return new MultiChoiceConfigAttribute(getName(), getDescription(),
                                          isRequired(), isMultiValued(),

 opendj-sdk/opends/src/server/org/opends/server/config/ReadOnlyConfigAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -42,7 +42,6 @@
import org.opends.server.types.AttributeValue;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
@@ -57,11 +56,6 @@
public class ReadOnlyConfigAttribute
       extends ConfigAttribute
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.ReadOnlyConfigAttribute";



@@ -85,9 +79,6 @@
  {
    super(name, description, false, isMultiValued, false);

    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(description),
                            String.valueOf(isMultiValued));

    values = new ArrayList<String>();
  }
@@ -106,8 +97,6 @@
  {
    super(name, description, false, false, false, getValueSet(value));

    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(description), String.valueOf(value));

    if (value == null)
    {
@@ -135,9 +124,6 @@
  {
    super(name, description, false, true, false, getValueSet(values));

    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(description),
                            String.valueOf(values));

    if (values == null)
    {
@@ -161,7 +147,6 @@
   */
  public String getDataType()
  {
    assert debugEnter(CLASS_NAME, "getDataType");

    return "ReadOnly";
  }
@@ -175,7 +160,6 @@
   */
  public AttributeSyntax getSyntax()
  {
    assert debugEnter(CLASS_NAME,"getSyntax");

    return DirectoryServer.getDefaultStringSyntax();
  }
@@ -194,7 +178,6 @@
  public String activeValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "activeValue");

    if ((values == null) || values.isEmpty())
    {
@@ -222,7 +205,6 @@
   */
  public List<String> activeValues()
  {
    assert debugEnter(CLASS_NAME, "activeValues");

    return values;
  }
@@ -243,7 +225,6 @@
  public String pendingValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "pendingValue");

    return  activeValue();
  }
@@ -259,7 +240,6 @@
   */
  public List<String> pendingValues()
  {
    assert debugEnter(CLASS_NAME, "pendingValues");

    return activeValues();
  }
@@ -276,7 +256,6 @@
  public void setValue(String value)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(value));

    int    msgID   = MSGID_CONFIG_ATTR_READ_ONLY;
    String message = getMessage(msgID, getName());
@@ -296,7 +275,6 @@
  public void setValues(List<String> values)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValues", String.valueOf(values));

    int    msgID   = MSGID_CONFIG_ATTR_READ_ONLY;
    String message = getMessage(msgID, getName());
@@ -314,7 +292,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(String value)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(value));

    LinkedHashSet<AttributeValue> valueSet =
         new LinkedHashSet<AttributeValue>(1);
@@ -336,7 +313,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(List<String> values)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(values));

    if (values == null)
    {
@@ -364,7 +340,6 @@
   */
  public void applyPendingValues()
  {
    assert debugEnter(CLASS_NAME, "applyPendingValues");
  }


@@ -384,8 +359,6 @@
  public boolean valueIsAcceptable(AttributeValue value,
                                   StringBuilder rejectReason)
  {
    assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
                      "java.lang.StringBuilder");

    rejectReason.append(getMessage(MSGID_CONFIG_ATTR_READ_ONLY, getName()));
    return false;
@@ -417,9 +390,6 @@
                              boolean allowFailures)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "stringsToValues",
                      String.valueOf(valueStrings),
                      String.valueOf(allowFailures));

    if ((valueStrings == null) || valueStrings.isEmpty())
    {
@@ -454,7 +424,6 @@
   */
  public List<String> activeValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "activeValuesToStrings");

    return values;
  }
@@ -474,7 +443,6 @@
   */
  public List<String> pendingValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "pendingValuesToStrings");

    return activeValuesToStrings();
  }
@@ -505,8 +473,6 @@
  public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute",
                      String.valueOf(attributeList));

    // The attribute won't be present in the entry, so we'll just return a
    // reference to this attribute.
@@ -525,7 +491,6 @@
   */
  public javax.management.Attribute toJMXAttribute()
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute");

    if (isMultiValued())
    {
@@ -559,7 +524,6 @@
    public javax.management.Attribute toJMXAttributePending()
    {
        // Should never occurs !!!
        assert debugEnter(CLASS_NAME, "toJMXAttributePending");
        return toJMXAttribute();
    }

@@ -578,8 +542,6 @@
   */
  public void toJMXAttribute(AttributeList attributeList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute",
                      String.valueOf(attributeList));

    javax.management.Attribute jmxAttr = toJMXAttribute();
    attributeList.add(jmxAttr);
@@ -601,8 +563,6 @@
   */
  public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
                      String.valueOf(attributeInfoList));


    if (isMultiValued())
@@ -632,7 +592,6 @@
   */
  public MBeanParameterInfo toJMXParameterInfo()
  {
    assert debugEnter(CLASS_NAME, "toJMXParameterInfo");

    if (isMultiValued())
    {
@@ -662,7 +621,6 @@
  public void setValue(javax.management.Attribute jmxAttribute)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(jmxAttribute));

    int    msgID   = MSGID_CONFIG_ATTR_READ_ONLY;
    String message = getMessage(msgID, getName());
@@ -678,7 +636,6 @@
   */
  public ConfigAttribute duplicate()
  {
    assert debugEnter(CLASS_NAME, "duplicate");

    return new ReadOnlyConfigAttribute(getName(), getDescription(),
                                       activeValues());

 opendj-sdk/opends/src/server/org/opends/server/config/StringConfigAttribute.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.config;

@@ -43,13 +43,14 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;



@@ -60,11 +61,6 @@
public class StringConfigAttribute
       extends ConfigAttribute
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.config.StringConfigAttribute";



@@ -98,11 +94,6 @@
  {
    super(name, description, isRequired, isMultiValued, requiresAdminAction);

    assert debugConstructor(CLASS_NAME, String.valueOf(name),
                            String.valueOf(isRequired),
                            String.valueOf(isMultiValued),
                            String.valueOf(description),
                            String.valueOf(requiresAdminAction));

    activeValues  = new ArrayList<String>();
    pendingValues = activeValues;
@@ -134,16 +125,6 @@
    super(name, description, isRequired, isMultiValued, requiresAdminAction,
          getValueSet(value));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(value)
                            });

    if (value == null)
    {
@@ -184,16 +165,6 @@
    super(name, description, isRequired, isMultiValued, requiresAdminAction,
          getValueSet(values));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(values)
                            });

    if (values == null)
    {
@@ -238,17 +209,6 @@
          getValueSet(activeValues), (pendingValues != null),
          getValueSet(pendingValues));

    assert debugConstructor(CLASS_NAME,
                            new String[]
                            {
                              String.valueOf(name),
                              String.valueOf(isRequired),
                              String.valueOf(isMultiValued),
                              String.valueOf(description),
                              String.valueOf(requiresAdminAction),
                              String.valueOf(activeValues),
                              String.valueOf(pendingValues)
                            });

    if (activeValues == null)
    {
@@ -281,7 +241,6 @@
   */
  public String getDataType()
  {
    assert debugEnter(CLASS_NAME, "getDataType");

    return "String";
  }
@@ -295,7 +254,6 @@
   */
  public AttributeSyntax getSyntax()
  {
    assert debugEnter(CLASS_NAME,"getSyntax");

    return DirectoryServer.getDefaultStringSyntax();
  }
@@ -314,7 +272,6 @@
  public String activeValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "activeValue");

    if ((activeValues == null) || activeValues.isEmpty())
    {
@@ -342,7 +299,6 @@
   */
  public List<String> activeValues()
  {
    assert debugEnter(CLASS_NAME, "activeValues");

    return activeValues;
  }
@@ -363,7 +319,6 @@
  public String pendingValue()
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "pendingValue");

    if (! hasPendingValues())
    {
@@ -398,7 +353,6 @@
   */
  public List<String> pendingValues()
  {
    assert debugEnter(CLASS_NAME, "pendingValues");

    if (! hasPendingValues())
    {
@@ -420,7 +374,6 @@
  public void setValue(String value)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(value));

    if ((value == null) || (value.length() == 0))
    {
@@ -457,7 +410,6 @@
  public void setValues(List<String> values)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValues", String.valueOf(values));


    // First check if the set is empty and if that is allowed.
@@ -548,7 +500,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(String value)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(value));

    LinkedHashSet<AttributeValue> valueSet =
         new LinkedHashSet<AttributeValue>(1);
@@ -570,7 +521,6 @@
   */
  private static LinkedHashSet<AttributeValue> getValueSet(List<String> values)
  {
    assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(values));

    if (values == null)
    {
@@ -598,7 +548,6 @@
   */
  public void applyPendingValues()
  {
    assert debugEnter(CLASS_NAME, "applyPendingValues");

    if (! hasPendingValues())
    {
@@ -626,8 +575,6 @@
  public boolean valueIsAcceptable(AttributeValue value,
                                   StringBuilder rejectReason)
  {
    assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
                      "java.lang.StringBuilder");


    // The only requirement is that the value is not null or empty.
@@ -668,9 +615,6 @@
                              boolean allowFailures)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "stringsToValues",
                      String.valueOf(valueStrings),
                      String.valueOf(allowFailures));

    if ((valueStrings == null) || valueStrings.isEmpty())
    {
@@ -750,7 +694,6 @@
   */
  public List<String> activeValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "activeValuesToStrings");

    return activeValues;
  }
@@ -770,7 +713,6 @@
   */
  public List<String> pendingValuesToStrings()
  {
    assert debugEnter(CLASS_NAME, "pendingValuesToStrings");

    if (hasPendingValues())
    {
@@ -808,8 +750,6 @@
  public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "getConfigAttribute",
                      String.valueOf(attributeList));


    ArrayList<String> activeValues  = null;
@@ -955,7 +895,6 @@
   */
  private javax.management.Attribute _toJMXAttribute(boolean pending)
  {
    assert debugEnter(CLASS_NAME, "_toJMXAttribute");
    List<String> requestedValues ;
    String name ;
    if (pending)
@@ -998,7 +937,6 @@
   */
  public javax.management.Attribute toJMXAttribute()
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute");
    return _toJMXAttribute(false) ;
  }

@@ -1012,7 +950,6 @@
   */
  public javax.management.Attribute toJMXAttributePending()
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributePending");
    return _toJMXAttribute(true) ;
  }

@@ -1031,8 +968,6 @@
   */
  public void toJMXAttribute(AttributeList attributeList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttribute",
                      String.valueOf(attributeList));

    if (activeValues.size() > 0)
    {
@@ -1099,8 +1034,6 @@
   */
  public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
  {
    assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
                      String.valueOf(attributeInfoList));


    if (isMultiValued())
@@ -1151,7 +1084,6 @@
   */
  public MBeanParameterInfo toJMXParameterInfo()
  {
    assert debugEnter(CLASS_NAME, "toJMXParameterInfo");

    if (isMultiValued())
    {
@@ -1181,7 +1113,6 @@
  public void setValue(javax.management.Attribute jmxAttribute)
         throws ConfigException
  {
    assert debugEnter(CLASS_NAME, "setValue", String.valueOf(jmxAttribute));

    Object value = jmxAttribute.getValue();
    if (value instanceof String)
@@ -1208,13 +1139,19 @@
        }
        catch (ConfigException ce)
        {
          assert debugException(CLASS_NAME, "setValue", ce);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, ce);
          }

          throw ce;
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "setValue", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int msgID = MSGID_CONFIG_ATTR_INVALID_STRING_VALUE;
          String message = getMessage(msgID, getName(), String.valueOf(value),
@@ -1247,7 +1184,6 @@
   */
  public ConfigAttribute duplicate()
  {
    assert debugEnter(CLASS_NAME, "duplicate");

    return new StringConfigAttribute(getName(), getDescription(), isRequired(),
                                     isMultiValued(), requiresAdminAction(),

 opendj-sdk/opends/src/server/org/opends/server/config/package-info.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */



 opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableRequestControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -32,7 +32,6 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Control;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -47,11 +46,6 @@
public class AccountUsableRequestControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.AccountUsableRequestControl";



@@ -63,7 +57,6 @@
  {
    super(OID_ACCOUNT_USABLE_CONTROL, false);

    assert debugConstructor(CLASS_NAME);
  }


@@ -80,8 +73,6 @@
  {
    super(oid, isCritical);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical));
  }


@@ -102,7 +93,6 @@
  public static AccountUsableRequestControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));

    if (control.hasValue())
    {
@@ -125,7 +115,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -142,7 +131,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("AccountUsableRequestControl()");
  }

 opendj-sdk/opends/src/server/org/opends/server/controls/AccountUsableResponseControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -39,8 +39,10 @@
import org.opends.server.protocols.ldap.LDAPException;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -69,11 +71,6 @@
public class AccountUsableResponseControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.AccountUsableResponseControl";



@@ -176,8 +173,6 @@
    super(OID_ACCOUNT_USABLE_CONTROL, false,
          encodeValue(secondsBeforeExpiration));

    assert debugConstructor(CLASS_NAME,
                            String.valueOf(secondsBeforeExpiration));

    this.secondsBeforeExpiration = secondsBeforeExpiration;

@@ -211,9 +206,6 @@
  {
    super(oid, isCritical, encodeValue(secondsBeforeExpiration));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(secondsBeforeExpiration));

    this.secondsBeforeExpiration = secondsBeforeExpiration;

@@ -260,11 +252,6 @@
          encodeValue(isInactive, isReset, isExpired, remainingGraceLogins,
                      isLocked, secondsBeforeUnlock));

    assert debugConstructor(CLASS_NAME, String.valueOf(isInactive),
                            String.valueOf(isReset), String.valueOf(isExpired),
                            String.valueOf(remainingGraceLogins),
                            String.valueOf(isLocked),
                            String.valueOf(secondsBeforeUnlock));

    this.isInactive           = isInactive;
    this.isReset              = isReset;
@@ -316,13 +303,6 @@
          encodeValue(isInactive, isReset, isExpired, remainingGraceLogins,
                      isLocked, secondsBeforeUnlock));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(isInactive), String.valueOf(isReset),
                            String.valueOf(isExpired),
                            String.valueOf(remainingGraceLogins),
                            String.valueOf(isLocked),
                            String.valueOf(secondsBeforeUnlock));

    this.isInactive           = isInactive;
    this.isReset              = isReset;
@@ -385,16 +365,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(isAvailable),
                            String.valueOf(secondsBeforeExpiration),
                            String.valueOf(isInactive),
                            String.valueOf(isReset),
                            String.valueOf(isExpired),
                            String.valueOf(remainingGraceLogins),
                            String.valueOf(isLocked),
                            String.valueOf(secondsBeforeUnlock));

    this.isUsable                = isAvailable;
    this.secondsBeforeExpiration = secondsBeforeExpiration;
@@ -422,8 +392,6 @@
   */
  private static ASN1OctetString encodeValue(int secondsBeforeExpiration)
  {
    assert debugEnter(CLASS_NAME, "encodeValue",
                      String.valueOf(secondsBeforeExpiration));


    ASN1Integer sbeInteger = new ASN1Integer(TYPE_SECONDS_BEFORE_EXPIRATION,
@@ -466,11 +434,6 @@
                                             boolean isLocked,
                                             int secondsBeforeUnlock)
  {
    assert debugEnter(CLASS_NAME, "encodeValue", String.valueOf(isInactive),
                      String.valueOf(isReset), String.valueOf(isExpired),
                      String.valueOf(remainingGraceLogins),
                      String.valueOf(isLocked),
                      String.valueOf(secondsBeforeUnlock));


    ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(5);
@@ -525,7 +488,6 @@
  public static AccountUsableResponseControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));


    ASN1OctetString controlValue = control.getValue();
@@ -608,17 +570,23 @@
    }
    catch (ASN1Exception ae)
    {
      assert debugException(CLASS_NAME, "decodeControl", ae);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ae);
      }

      int    msgID   = MSGID_ACCTUSABLERES_DECODE_ERROR;
      int msgID = MSGID_ACCTUSABLERES_DECODE_ERROR;
      String message = getMessage(msgID, ae.getMessage());
      throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, msgID, message);
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "decodeControl", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_ACCTUSABLERES_DECODE_ERROR;
      int msgID = MSGID_ACCTUSABLERES_DECODE_ERROR;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
      throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, msgID, message);
    }
@@ -634,7 +602,6 @@
   */
  public boolean isUsable()
  {
    assert debugEnter(CLASS_NAME, "isAvailable");

    return isUsable;
  }
@@ -651,7 +618,6 @@
   */
  public int getSecondsBeforeExpiration()
  {
    assert debugEnter(CLASS_NAME, "getSecondsBeforeExpiration");

    return secondsBeforeExpiration;
  }
@@ -667,7 +633,6 @@
   */
  public boolean isInactive()
  {
    assert debugEnter(CLASS_NAME, "isInactive");

    return isInactive;
  }
@@ -684,7 +649,6 @@
   */
  public boolean isReset()
  {
    assert debugEnter(CLASS_NAME, "isReset");

    return isReset;
  }
@@ -699,7 +663,6 @@
   */
  public boolean isExpired()
  {
    assert debugEnter(CLASS_NAME, "isExpired");

    return isExpired;
  }
@@ -715,7 +678,6 @@
   */
  public int getRemainingGraceLogins()
  {
    assert debugEnter(CLASS_NAME, "getRemainingGraceLogins");

    return remainingGraceLogins;
  }
@@ -730,7 +692,6 @@
   */
  public boolean isLocked()
  {
    assert debugEnter(CLASS_NAME, "isLocked");

    return isLocked;
  }
@@ -748,7 +709,6 @@
   */
  public int getSecondsBeforeUnlock()
  {
    assert debugEnter(CLASS_NAME, "getSecondsBeforeUnlock");

    return secondsBeforeUnlock;
  }
@@ -762,7 +722,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -779,7 +738,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("AccountUsableResponseControl(isUsable=");
    buffer.append(isUsable);

 opendj-sdk/opends/src/server/org/opends/server/controls/AuthorizationIdentityResponseControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -34,11 +34,9 @@
import org.opends.server.types.Control;
import org.opends.server.types.DN;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;



@@ -51,11 +49,6 @@
public class AuthorizationIdentityResponseControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.AuthorizationIdentityResponseControl";



@@ -72,7 +65,6 @@
  {
    super(OID_AUTHZID_RESPONSE, false, new ASN1OctetString());

    assert debugConstructor(CLASS_NAME);
  }


@@ -87,7 +79,6 @@
  {
    super(OID_AUTHZID_RESPONSE, false, encodeValue(authorizationID));

    assert debugConstructor(CLASS_NAME, String.valueOf(authorizationID));

    this.authorizationID = authorizationID;
  }
@@ -104,7 +95,6 @@
  {
    super(OID_AUTHZID_RESPONSE, false, encodeValue(authorizationDN));

    assert debugConstructor(CLASS_NAME, String.valueOf(authorizationDN));

    if (authorizationDN == null)
    {
@@ -133,9 +123,6 @@
  {
    super(oid, isCritical, encodeValue(authorizationID));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(authorizationID));

    this.authorizationID = authorizationID;
  }
@@ -157,9 +144,6 @@
  {
    super(oid, isCritical, encodeValue(authorizationDN));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(authorizationDN));

    if (authorizationDN == null)
    {
@@ -190,10 +174,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(authorizationID),
                            String.valueOf(encodedValue));

    this.authorizationID = authorizationID;
  }
@@ -211,8 +191,6 @@
   */
  private static ASN1OctetString encodeValue(String authorizationID)
  {
    assert debugEnter(CLASS_NAME, "encodeValue",
                      String.valueOf(authorizationID));


    return new ASN1OctetString(authorizationID);
@@ -231,8 +209,6 @@
   */
  private static ASN1OctetString encodeValue(DN authorizationDN)
  {
    assert debugEnter(CLASS_NAME, "encodeValue",
                      String.valueOf(authorizationDN));


    if (authorizationDN == null)
@@ -264,7 +240,6 @@
                                                          Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));


    if (! control.hasValue())
@@ -290,7 +265,6 @@
   */
  public String getAuthorizationID()
  {
    assert debugEnter(CLASS_NAME, "getAuthorizationID");

    return authorizationID;
  }
@@ -306,8 +280,6 @@
   */
  public void setAuthorizationID(String authorizationID)
  {
    assert debugEnter(CLASS_NAME, "setAuthorizationID",
                      String.valueOf(authorizationID));

    this.authorizationID = authorizationID;
    setValue(encodeValue(authorizationID));
@@ -324,7 +296,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -341,7 +312,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("AuthorizationIdentityResponseControl(authzID=\"");
    buffer.append(authorizationID);

 opendj-sdk/opends/src/server/org/opends/server/controls/EntryChangeNotificationControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -40,8 +40,10 @@
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.types.Control;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -57,11 +59,6 @@
public class EntryChangeNotificationControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.EntryChangeNotificationControl";



@@ -90,8 +87,6 @@
    super(OID_ENTRY_CHANGE_NOTIFICATION, false,
          encodeValue(changeType, null, changeNumber));

    assert debugConstructor(CLASS_NAME, String.valueOf(changeType),
                            String.valueOf(changeNumber));

    this.changeType   = changeType;
    this.changeNumber = changeNumber;
@@ -118,9 +113,6 @@
    super(OID_ENTRY_CHANGE_NOTIFICATION, false,
          encodeValue(changeType, previousDN, changeNumber));

    assert debugConstructor(CLASS_NAME, String.valueOf(changeType),
                            String.valueOf(previousDN),
                            String.valueOf(changeNumber));

    this.changeType   = changeType;
    this.previousDN   = previousDN;
@@ -149,11 +141,6 @@
  {
    super(oid, isCritical, encodeValue(changeType, previousDN, changeNumber));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(changeType),
                            String.valueOf(previousDN),
                            String.valueOf(changeNumber));

    this.changeType   = changeType;
    this.previousDN   = previousDN;
@@ -185,12 +172,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(changeType),
                            String.valueOf(previousDN),
                            String.valueOf(changeNumber),
                            String.valueOf(encodedValue));

    this.changeType   = changeType;
    this.previousDN   = previousDN;
@@ -216,8 +197,6 @@
                                                  changeType,
                                             DN previousDN, long changeNumber)
  {
    assert debugEnter(CLASS_NAME, "encodeValue", String.valueOf(changeType),
                      String.valueOf(previousDN), String.valueOf(changeNumber));


    ArrayList<ASN1Element> elements =
@@ -256,7 +235,6 @@
  public static EntryChangeNotificationControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));


    if (! control.hasValue())
@@ -334,7 +312,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "decodeControl", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_ECN_CANNOT_DECODE_VALUE;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -357,7 +338,6 @@
   */
  public PersistentSearchChangeType getChangeType()
  {
    assert debugEnter(CLASS_NAME, "getChangeType");

    return changeType;
  }
@@ -372,7 +352,6 @@
   */
  public void setChangeType(PersistentSearchChangeType changeType)
  {
    assert debugEnter(CLASS_NAME, "setChangeType", String.valueOf(changeType));

    this.changeType = changeType;

@@ -389,7 +368,6 @@
   */
  public DN getPreviousDN()
  {
    assert debugEnter(CLASS_NAME, "getPreviousDN");

    return previousDN;
  }
@@ -404,7 +382,6 @@
   */
  public void setPreviousDN(DN previousDN)
  {
    assert debugEnter(CLASS_NAME, "setPreviousDN", String.valueOf(previousDN));

    this.previousDN = previousDN;

@@ -421,7 +398,6 @@
   */
  public long getChangeNumber()
  {
    assert debugEnter(CLASS_NAME, "getChangeNumber");

    return changeNumber;
  }
@@ -436,8 +412,6 @@
   */
  public void setChangeNumber(long changeNumber)
  {
    assert debugEnter(CLASS_NAME, "setChangeNumber",
                      String.valueOf(changeNumber));

    this.changeNumber = changeNumber;

@@ -454,7 +428,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -471,7 +444,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("EntryChangeNotificationControl(changeType=");
    buffer.append(changeType.toString());

 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPAssertionRequestControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -37,8 +37,10 @@
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.SearchFilter;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -55,11 +57,6 @@
public class LDAPAssertionRequestControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.LDAPAssertionRequestControl";



@@ -85,8 +82,6 @@
    super(OID_LDAP_ASSERTION, isCritical,
          new ASN1OctetString(rawFilter.encode().encode()));

    assert debugConstructor(CLASS_NAME, String.valueOf(isCritical),
                            String.valueOf(rawFilter));

    this.rawFilter = rawFilter;

@@ -110,9 +105,6 @@
  {
    super(oid, isCritical, new ASN1OctetString(rawFilter.encode().encode()));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(rawFilter));

    this.rawFilter = rawFilter;

@@ -138,10 +130,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(rawFilter),
                            String.valueOf(encodedValue));

    this.rawFilter = rawFilter;

@@ -165,7 +153,6 @@
  public static LDAPAssertionRequestControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));

    if (! control.hasValue())
    {
@@ -182,7 +169,10 @@
    }
    catch (ASN1Exception ae)
    {
      assert debugException(CLASS_NAME, "decodeControl", ae);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ae);
      }

      int    msgID   = MSGID_LDAPASSERT_INVALID_CONTROL_VALUE;
      String message = getMessage(msgID, ae.getMessage());
@@ -206,7 +196,6 @@
   */
  public LDAPFilter getRawFilter()
  {
    assert debugEnter(CLASS_NAME, "getRawFilter");

    return rawFilter;
  }
@@ -221,7 +210,6 @@
   */
  public void setRawFilter(LDAPFilter rawFilter)
  {
    assert debugEnter(CLASS_NAME, "setRawFilter", String.valueOf(rawFilter));

    this.rawFilter = rawFilter;
    this.filter    = null;
@@ -242,7 +230,6 @@
  public SearchFilter getSearchFilter()
         throws DirectoryException
  {
    assert debugEnter(CLASS_NAME, "getSearchFilter");

    if (filter == null)
    {
@@ -261,7 +248,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -278,7 +264,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("LDAPAssertionRequestControl(criticality=");
    buffer.append(isCritical());

 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadRequestControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -43,7 +43,9 @@
import org.opends.server.types.Control;
import org.opends.server.types.ObjectClass;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -60,11 +62,6 @@
public class LDAPPostReadRequestControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.LDAPPostReadRequestControl";



@@ -100,8 +97,6 @@
    super(OID_LDAP_READENTRY_POSTREAD, isCritical,
          encodeAttributes(rawAttributes));

    assert debugConstructor(CLASS_NAME, String.valueOf(isCritical),
                            String.valueOf(rawAttributes));

    if (rawAttributes == null)
    {
@@ -135,9 +130,6 @@
  {
    super(oid, isCritical, encodeAttributes(rawAttributes));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(rawAttributes));

    if (rawAttributes == null)
    {
@@ -173,10 +165,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(rawAttributes),
                            String.valueOf(encodedValue));

    if (rawAttributes == null)
    {
@@ -210,7 +198,6 @@
  public static LDAPPostReadRequestControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));

    if (! control.hasValue())
    {
@@ -232,7 +219,10 @@
    }
    catch (ASN1Exception ae)
    {
      assert debugException(CLASS_NAME, "decodeControl", ae);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ae);
      }

      int    msgID   = MSGID_POSTREADREQ_CANNOT_DECODE_VALUE;
      String message = getMessage(msgID, ae.getMessage());
@@ -260,8 +250,6 @@
  private static ASN1OctetString encodeAttributes(LinkedHashSet<String>
                                                       rawAttributes)
  {
    assert debugEnter(CLASS_NAME, "encodeAttributes",
                      String.valueOf(rawAttributes));

    if (rawAttributes == null)
    {
@@ -289,7 +277,6 @@
   */
  public LinkedHashSet<String> getRawAttributes()
  {
    assert debugEnter(CLASS_NAME, "getRawAttributes");

    return rawAttributes;
  }
@@ -304,8 +291,6 @@
   */
  public void setRawAttributes(LinkedHashSet<String> rawAttributes)
  {
    assert debugEnter(CLASS_NAME, "setRawAttributes",
                      String.valueOf(rawAttributes));

    if (rawAttributes == null)
    {
@@ -331,7 +316,6 @@
   */
  public LinkedHashSet<AttributeType> getRequestedAttributes()
  {
    assert debugEnter(CLASS_NAME, "getRequestedAttributes");

    if (requestedAttributes == null)
    {
@@ -391,7 +375,6 @@
   */
  public boolean returnAllUserAttributes()
  {
    assert debugEnter(CLASS_NAME, "returnAllUserAttributes");

    if (requestedAttributes == null)
    {
@@ -415,7 +398,6 @@
   */
  public boolean returnAllOperationalAttributes()
  {
    assert debugEnter(CLASS_NAME, "returnAllOperationalAttributes");

    if (requestedAttributes == null)
    {
@@ -439,8 +421,6 @@
   */
  public boolean allowsAttribute(AttributeType attrType)
  {
    assert debugEnter(CLASS_NAME, "allowsAttribute",
                      String.valueOf(attrType));

    if (requestedAttributes == null)
    {
@@ -471,7 +451,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -488,7 +467,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("LDAPPostReadRequestControl(criticality=");
    buffer.append(isCritical());

 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPostReadResponseControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -36,8 +36,10 @@
import org.opends.server.protocols.ldap.SearchResultEntryProtocolOp;
import org.opends.server.types.Control;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -52,11 +54,6 @@
public class LDAPPostReadResponseControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.LDAPPostReadResponseControl";



@@ -77,7 +74,6 @@
    super(OID_LDAP_READENTRY_POSTREAD, false,
          encodeEntry(searchEntry));

    assert debugConstructor(CLASS_NAME, String.valueOf(searchEntry));

    this.searchEntry = searchEntry;
  }
@@ -99,9 +95,6 @@
  {
    super(oid, isCritical, encodeEntry(searchEntry));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(searchEntry));

    this.searchEntry = searchEntry;
  }
@@ -125,10 +118,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(searchEntry),
                            String.valueOf(encodedValue));

    this.searchEntry = searchEntry;
  }
@@ -151,7 +140,6 @@
  public static LDAPPostReadResponseControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));

    if (! control.hasValue())
    {
@@ -172,7 +160,10 @@
    }
    catch (ASN1Exception ae)
    {
      assert debugException(CLASS_NAME, "decodeControl", ae);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ae);
      }

      int    msgID   = MSGID_POSTREADRESP_CANNOT_DECODE_VALUE;
      String message = getMessage(msgID, ae.getMessage());
@@ -181,7 +172,10 @@
    }
    catch (LDAPException le)
    {
      assert debugException(CLASS_NAME, "decodeControl", le);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, le);
      }

      int    msgID   = MSGID_POSTREADRESP_CANNOT_DECODE_VALUE;
      String message = getMessage(msgID, le.getMessage());
@@ -205,7 +199,6 @@
   */
  private static ASN1OctetString encodeEntry(SearchResultEntry searchEntry)
  {
    assert debugEnter(CLASS_NAME, "encodeEntry", String.valueOf(searchEntry));


    SearchResultEntryProtocolOp protocolOp =
@@ -224,7 +217,6 @@
   */
  public SearchResultEntry getSearchEntry()
  {
    assert debugEnter(CLASS_NAME, "getSearchEntry");

    return searchEntry;
  }
@@ -240,8 +232,6 @@
   */
  public void setSearchEntry(SearchResultEntry searchEntry)
  {
    assert debugEnter(CLASS_NAME, "setSearchEntry",
                      String.valueOf(searchEntry));

    this.searchEntry = searchEntry;
    setValue(encodeEntry(searchEntry));
@@ -256,7 +246,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -273,7 +262,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("LDAPPostReadResponseControl(criticality=");
    buffer.append(isCritical());

 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadRequestControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -42,8 +42,10 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.Control;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -60,11 +62,6 @@
public class LDAPPreReadRequestControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.LDAPPreReadRequestControl";



@@ -100,8 +97,6 @@
    super(OID_LDAP_READENTRY_PREREAD, isCritical,
          encodeAttributes(rawAttributes));

    assert debugConstructor(CLASS_NAME, String.valueOf(isCritical),
                            String.valueOf(rawAttributes));

    if (rawAttributes == null)
    {
@@ -135,9 +130,6 @@
  {
    super(oid, isCritical, encodeAttributes(rawAttributes));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(rawAttributes));

    if (rawAttributes == null)
    {
@@ -173,10 +165,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(rawAttributes),
                            String.valueOf(encodedValue));

    if (rawAttributes == null)
    {
@@ -210,7 +198,6 @@
  public static LDAPPreReadRequestControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));

    if (! control.hasValue())
    {
@@ -232,7 +219,10 @@
    }
    catch (ASN1Exception ae)
    {
      assert debugException(CLASS_NAME, "decodeControl", ae);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ae);
      }

      int    msgID   = MSGID_PREREADREQ_CANNOT_DECODE_VALUE;
      String message = getMessage(msgID, ae.getMessage());
@@ -259,8 +249,6 @@
  private static ASN1OctetString encodeAttributes(LinkedHashSet<String>
                                                       rawAttributes)
  {
    assert debugEnter(CLASS_NAME, "encodeAttributes",
                      String.valueOf(rawAttributes));

    if (rawAttributes == null)
    {
@@ -288,7 +276,6 @@
   */
  public LinkedHashSet<String> getRawAttributes()
  {
    assert debugEnter(CLASS_NAME, "getRawAttributes");

    return rawAttributes;
  }
@@ -303,8 +290,6 @@
   */
  public void setRawAttributes(LinkedHashSet<String> rawAttributes)
  {
    assert debugEnter(CLASS_NAME, "setRawAttributes",
                      String.valueOf(rawAttributes));

    if (rawAttributes == null)
    {
@@ -330,7 +315,6 @@
   */
  public LinkedHashSet<AttributeType> getRequestedAttributes()
  {
    assert debugEnter(CLASS_NAME, "getRequestedAttributes");

    if (requestedAttributes == null)
    {
@@ -390,7 +374,6 @@
   */
  public boolean returnAllUserAttributes()
  {
    assert debugEnter(CLASS_NAME, "returnAllUserAttributes");

    if (requestedAttributes == null)
    {
@@ -414,7 +397,6 @@
   */
  public boolean returnAllOperationalAttributes()
  {
    assert debugEnter(CLASS_NAME, "returnAllOperationalAttributes");

    if (requestedAttributes == null)
    {
@@ -438,8 +420,6 @@
   */
  public boolean allowsAttribute(AttributeType attrType)
  {
    assert debugEnter(CLASS_NAME, "allowsAttribute",
                      String.valueOf(attrType));

    if (requestedAttributes == null)
    {
@@ -470,7 +450,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -487,7 +466,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("LDAPPreReadRequestControl(criticality=");
    buffer.append(isCritical());

 opendj-sdk/opends/src/server/org/opends/server/controls/LDAPPreReadResponseControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -36,8 +36,10 @@
import org.opends.server.protocols.ldap.SearchResultEntryProtocolOp;
import org.opends.server.types.Control;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -52,11 +54,6 @@
public class LDAPPreReadResponseControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.LDAPPreReadResponseControl";



@@ -77,7 +74,6 @@
    super(OID_LDAP_READENTRY_PREREAD, false,
          encodeEntry(searchEntry));

    assert debugConstructor(CLASS_NAME, String.valueOf(searchEntry));

    this.searchEntry = searchEntry;
  }
@@ -99,9 +95,6 @@
  {
    super(oid, isCritical, encodeEntry(searchEntry));

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(searchEntry));

    this.searchEntry = searchEntry;
  }
@@ -125,10 +118,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(oid),
                            String.valueOf(isCritical),
                            String.valueOf(searchEntry),
                            String.valueOf(encodedValue));

    this.searchEntry = searchEntry;
  }
@@ -151,7 +140,6 @@
  public static LDAPPreReadResponseControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));

    if (! control.hasValue())
    {
@@ -172,7 +160,10 @@
    }
    catch (ASN1Exception ae)
    {
      assert debugException(CLASS_NAME, "decodeControl", ae);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, ae);
      }

      int    msgID   = MSGID_PREREADRESP_CANNOT_DECODE_VALUE;
      String message = getMessage(msgID, ae.getMessage());
@@ -181,7 +172,10 @@
    }
    catch (LDAPException le)
    {
      assert debugException(CLASS_NAME, "decodeControl", le);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, le);
      }

      int    msgID   = MSGID_PREREADRESP_CANNOT_DECODE_VALUE;
      String message = getMessage(msgID, le.getMessage());
@@ -205,7 +199,6 @@
   */
  private static ASN1OctetString encodeEntry(SearchResultEntry searchEntry)
  {
    assert debugEnter(CLASS_NAME, "encodeEntry", String.valueOf(searchEntry));


    SearchResultEntryProtocolOp protocolOp =
@@ -224,7 +217,6 @@
   */
  public SearchResultEntry getSearchEntry()
  {
    assert debugEnter(CLASS_NAME, "getSearchEntry");

    return searchEntry;
  }
@@ -240,8 +232,6 @@
   */
  public void setSearchEntry(SearchResultEntry searchEntry)
  {
    assert debugEnter(CLASS_NAME, "setSearchEntry",
                      String.valueOf(searchEntry));

    this.searchEntry = searchEntry;
    setValue(encodeEntry(searchEntry));
@@ -256,7 +246,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -273,7 +262,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    buffer.append("LDAPPreReadResponseControl(criticality=");
    buffer.append(isCritical());

 opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesControl.java

@@ -22,7 +22,7 @@
 * CDDL HEADER END
 *
 *
 *      Portions Copyright 2006 Sun Microsystems, Inc.
 *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
 */
package org.opends.server.controls;

@@ -38,8 +38,10 @@
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.Control;
import org.opends.server.types.DebugLogLevel;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -56,11 +58,6 @@
public class MatchedValuesControl
       extends Control
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.MatchedValuesControl";



@@ -83,8 +80,6 @@
  {
    super(OID_MATCHED_VALUES, isCritical, encodeValue(filters));

    assert debugConstructor(CLASS_NAME, String.valueOf(isCritical),
                            String.valueOf(filters));

    this.filters = filters;
  }
@@ -106,8 +101,6 @@
  {
    super(oid, isCritical, encodeValue(filters));

    assert debugConstructor(CLASS_NAME, String.valueOf(isCritical),
                            String.valueOf(filters));

    this.filters = filters;
  }
@@ -132,8 +125,6 @@
  {
    super(oid, isCritical, encodedValue);

    assert debugConstructor(CLASS_NAME, String.valueOf(isCritical),
                            String.valueOf(filters));

    this.filters = filters;
  }
@@ -151,8 +142,6 @@
  private static ASN1OctetString
                      encodeValue(ArrayList<MatchedValuesFilter> filters)
  {
    assert debugEnter(CLASS_NAME, "encodeValue",
                      String.valueOf(filters));


    ArrayList<ASN1Element> elements =
@@ -183,7 +172,6 @@
  public static MatchedValuesControl decodeControl(Control control)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decodeControl", String.valueOf(control));


    if (! control.hasValue())
@@ -202,7 +190,10 @@
    }
    catch (Exception e)
    {
      assert debugException(CLASS_NAME, "decodeControl", e);
      if (debugEnabled())
      {
        debugCought(DebugLogLevel.ERROR, e);
      }

      int    msgID   = MSGID_MATCHEDVALUES_CANNOT_DECODE_VALUE_AS_SEQUENCE;
      String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -239,7 +230,6 @@
   */
  public ArrayList<MatchedValuesFilter> getFilters()
  {
    assert debugEnter(CLASS_NAME, "getFilters");

    return filters;
  }
@@ -259,8 +249,6 @@
   */
  public boolean valueMatches(AttributeType type, AttributeValue value)
  {
    assert debugEnter(CLASS_NAME, "valueMatches", String.valueOf(type),
                      String.valueOf(value));

    for (MatchedValuesFilter f : filters)
    {
@@ -273,7 +261,10 @@
      }
      catch (Exception e)
      {
        assert debugException(CLASS_NAME, "valueMatches", e);
        if (debugEnabled())
        {
          debugCought(DebugLogLevel.ERROR, e);
        }
      }
    }

@@ -291,7 +282,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -308,7 +298,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    if (filters.size() == 1)
    {

 opendj-sdk/opends/src/server/org/opends/server/controls/MatchedValuesFilter.java

@@ -49,7 +49,9 @@
import org.opends.server.types.ConditionResult;
import org.opends.server.util.Validator;

import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.debug.DebugLogger.debugCought;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.ProtocolMessages.*;
import static org.opends.server.protocols.ldap.LDAPConstants.*;
@@ -67,11 +69,6 @@
 */
public class MatchedValuesFilter
{
  /**
   * The fully-qualified name of this class for debugging purposes.
   */
  private static final String CLASS_NAME =
       "org.opends.server.controls.MatchedValuesFilter";



@@ -198,12 +195,6 @@
                              List<ASN1OctetString> subAny,
                              ASN1OctetString subFinal, String matchingRuleID)
  {
    assert debugConstructor(CLASS_NAME, byteToHex(matchType),
                            String.valueOf(rawAttributeType),
                            String.valueOf(rawAssertionValue),
                            String.valueOf(subInitial), String.valueOf(subAny),
                            String.valueOf(subFinal),
                            String.valueOf(matchingRuleID));


    this.matchType         = matchType;
@@ -241,9 +232,6 @@
                                         String rawAttributeType,
                                         ASN1OctetString rawAssertionValue)
  {
    assert debugEnter(CLASS_NAME, "createEqualityFilter",
                      String.valueOf(rawAttributeType),
                      String.valueOf(rawAssertionValue));

    Validator.ensureNotNull(rawAttributeType,rawAssertionValue);

@@ -265,9 +253,6 @@
                                         AttributeType attributeType,
                                         AttributeValue assertionValue)
  {
    assert debugEnter(CLASS_NAME, "createEqualityFilter",
                      String.valueOf(attributeType),
                      String.valueOf(assertionValue));


    Validator.ensureNotNull(attributeType, assertionValue);
@@ -302,10 +287,6 @@
                                         List<ASN1OctetString> subAny,
                                         ASN1OctetString subFinal)
  {
    assert debugEnter(CLASS_NAME, "createSubstringsFilter",
                      String.valueOf(rawAttributeType),
                      String.valueOf(subInitial), String.valueOf(subAny),
                      String.valueOf(subFinal));


    Validator.ensureNotNull(rawAttributeType);
@@ -331,9 +312,6 @@
                                         List<ASN1OctetString> subAny,
                                         ASN1OctetString subFinal)
  {
    assert debugEnter(CLASS_NAME, "createSubstringsFilter",
                      String.valueOf(attributeType), String.valueOf(subInitial),
                      String.valueOf(subAny), String.valueOf(subFinal));


    Validator.ensureNotNull(attributeType);
@@ -361,9 +339,6 @@
                                         String rawAttributeType,
                                         ASN1OctetString rawAssertionValue)
  {
    assert debugEnter(CLASS_NAME, "createGreaterOrEqualFilter",
                      String.valueOf(rawAttributeType),
                      String.valueOf(rawAssertionValue));

   Validator.ensureNotNull(rawAttributeType, rawAssertionValue);

@@ -385,9 +360,6 @@
                                         AttributeType attributeType,
                                         AttributeValue assertionValue)
  {
    assert debugEnter(CLASS_NAME, "createGreaterOrEqualFilter",
                      String.valueOf(attributeType),
                      String.valueOf(assertionValue));

    Validator.ensureNotNull(attributeType, assertionValue);

@@ -418,9 +390,6 @@
                                         String rawAttributeType,
                                         ASN1OctetString rawAssertionValue)
  {
    assert debugEnter(CLASS_NAME, "createLessOrEqualFilter",
                      String.valueOf(rawAttributeType),
                      String.valueOf(rawAssertionValue));


    Validator.ensureNotNull(rawAttributeType, rawAssertionValue);
@@ -442,9 +411,6 @@
                                         AttributeType attributeType,
                                         AttributeValue assertionValue)
  {
    assert debugEnter(CLASS_NAME, "createLessOrEqualFilter",
                      String.valueOf(attributeType),
                      String.valueOf(assertionValue));

    Validator.ensureNotNull(attributeType, assertionValue);

@@ -472,8 +438,6 @@
   */
  public static MatchedValuesFilter createPresentFilter(String rawAttributeType)
  {
    assert debugEnter(CLASS_NAME, "createPresentFilter",
                      String.valueOf(rawAttributeType));

    Validator.ensureNotNull(rawAttributeType) ;
    return new MatchedValuesFilter(PRESENT_TYPE, rawAttributeType, null, null,
@@ -492,8 +456,6 @@
  public static MatchedValuesFilter createPresentFilter(
                                         AttributeType attributeType)
  {
    assert debugEnter(CLASS_NAME, "createPresentFilter",
                      String.valueOf(attributeType));

    Validator.ensureNotNull(attributeType);
    String rawAttributeType = attributeType.getNameOrOID();
@@ -520,9 +482,6 @@
                                         String rawAttributeType,
                                         ASN1OctetString rawAssertionValue)
  {
    assert debugEnter(CLASS_NAME, "createApproximateFilter",
                      String.valueOf(rawAttributeType),
                      String.valueOf(rawAssertionValue));

    Validator.ensureNotNull(rawAttributeType,rawAssertionValue);

@@ -544,9 +503,6 @@
                                         AttributeType attributeType,
                                         AttributeValue assertionValue)
  {
    assert debugEnter(CLASS_NAME, "createApproximateFilter",
                      String.valueOf(attributeType),
                      String.valueOf(assertionValue));


    Validator.ensureNotNull(attributeType,assertionValue);
@@ -579,10 +535,6 @@
                                         String matchingRuleID,
                                         ASN1OctetString rawAssertionValue)
  {
    assert debugEnter(CLASS_NAME, "createExtensibleMatchFilter",
                      String.valueOf(rawAttributeType),
                      String.valueOf(matchingRuleID),
                      String.valueOf(rawAssertionValue));

    Validator
        .ensureNotNull(rawAttributeType, matchingRuleID, rawAssertionValue);
@@ -607,10 +559,6 @@
                                         MatchingRule matchingRule,
                                         AttributeValue assertionValue)
  {
    assert debugEnter(CLASS_NAME, "createExtensibleMatchFilter",
                      String.valueOf(attributeType),
                      String.valueOf(matchingRule),
                      String.valueOf(assertionValue));


    Validator.ensureNotNull(attributeType, matchingRule, assertionValue);
@@ -645,8 +593,6 @@
  public static MatchedValuesFilter createFromLDAPFilter(LDAPFilter filter)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "createFromLDAPFilter",
                      String.valueOf(filter));

    switch (filter.getFilterType())
    {
@@ -736,7 +682,6 @@
   */
  public ASN1Element encode()
  {
    assert debugEnter(CLASS_NAME, "encode");


    switch (matchType)
@@ -824,7 +769,6 @@
  public static MatchedValuesFilter decode(ASN1Element element)
         throws LDAPException
  {
    assert debugEnter(CLASS_NAME, "decode", String.valueOf(element));


    switch (element.getType())
@@ -860,7 +804,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "decode", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_MVFILTER_CANNOT_DECODE_AVA;
          String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -959,7 +906,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "decode", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_MVFILTER_CANNOT_DECODE_SUBSTRINGS;
          String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -979,7 +929,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "decode", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_MVFILTER_CANNOT_DECODE_PRESENT_TYPE;
          String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -1073,7 +1026,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "decode", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          int    msgID   = MSGID_MVFILTER_CANNOT_DECODE_EXTENSIBLE_MATCH;
          String message = getMessage(msgID, stackTraceToSingleLineString(e));
@@ -1098,7 +1054,6 @@
   */
  public byte getMatchType()
  {
    assert debugEnter(CLASS_NAME, "getMatchType");

    return matchType;
  }
@@ -1114,7 +1069,6 @@
   */
  public String getRawAttributeType()
  {
    assert debugEnter(CLASS_NAME, "getRawAttributeType");

    return rawAttributeType;
  }
@@ -1130,8 +1084,6 @@
   */
  public void setRawAttributeType(String rawAttributeType)
  {
    assert debugEnter(CLASS_NAME, "setRawAttributeType",
                      String.valueOf(rawAttributeType));

    this.rawAttributeType = rawAttributeType;

@@ -1153,7 +1105,6 @@
   */
  public AttributeType getAttributeType()
  {
    assert debugEnter(CLASS_NAME, "getAttributeType");

    if (attributeType == null)
    {
@@ -1181,8 +1132,6 @@
   */
  public void setAttributeType(AttributeType attributeType)
  {
    assert debugEnter(CLASS_NAME, "setAttributeType",
                      String.valueOf(attributeType));

    this.attributeType = attributeType;

@@ -1213,7 +1162,6 @@
   */
  public ASN1OctetString getRawAssertionValue()
  {
    assert debugEnter(CLASS_NAME, "getRawAssertionValue");

    return rawAssertionValue;
  }
@@ -1229,8 +1177,6 @@
   */
  public void setRawAssertionValue(ASN1OctetString rawAssertionValue)
  {
    assert debugEnter(CLASS_NAME, "setRawAssertionValue",
                      String.valueOf(rawAssertionValue));

    this.rawAssertionValue = rawAssertionValue;

@@ -1248,7 +1194,6 @@
   */
  public AttributeValue getAssertionValue()
  {
    assert debugEnter(CLASS_NAME, "getAssertionValue");

    if (assertionValue == null)
    {
@@ -1271,8 +1216,6 @@
   */
  public void setAssertionValue(AttributeValue assertionValue)
  {
    assert debugEnter(CLASS_NAME, "setAssertionValue",
                      String.valueOf(assertionValue));

    this.assertionValue = assertionValue;

@@ -1298,7 +1241,6 @@
   */
  public ASN1OctetString getSubInitialElement()
  {
    assert debugEnter(CLASS_NAME, "getSubInitialElement");

    return subInitial;
  }
@@ -1312,8 +1254,6 @@
   */
  public void setSubInitialElement(ASN1OctetString subInitial)
  {
    assert debugEnter(CLASS_NAME, "setSubInitialElement",
                      String.valueOf(subInitial));

    this.subInitial = subInitial;

@@ -1331,7 +1271,6 @@
   */
  public ASN1OctetString getNormalizedSubInitialElement()
  {
    assert debugEnter(CLASS_NAME, "getNormalizedSubInitialElement");

    if (normalizedSubInitial == null)
    {
@@ -1345,8 +1284,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "getNormalizedSubInitialElement",
                                e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
        }
      }
    }
@@ -1365,7 +1306,6 @@
   */
  public List<ASN1OctetString> getSubAnyElements()
  {
    assert debugEnter(CLASS_NAME, "getSubAnyElements");

    return subAny;
  }
@@ -1379,7 +1319,6 @@
   */
  public void setSubAnyElements(List<ASN1OctetString> subAny)
  {
    assert debugEnter(CLASS_NAME, "setSubAnyElements", String.valueOf(subAny));

    this.subAny = subAny;

@@ -1400,7 +1339,6 @@
   */
  public List<ASN1OctetString> getNormalizedSubAnyElements()
  {
    assert debugEnter(CLASS_NAME, "getNormalizedSubAnyElements");

    if (normalizedSubAny == null)
    {
@@ -1427,7 +1365,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "getNormalizedSubAnyElements", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }

          normalizedSubAny = null;
        }
@@ -1447,7 +1388,6 @@
   */
  public ASN1OctetString getSubFinalElement()
  {
    assert debugEnter(CLASS_NAME, "getSubFinal");

    return subFinal;
  }
@@ -1461,8 +1401,6 @@
   */
  public void setSubFinalElement(ASN1OctetString subFinal)
  {
    assert debugEnter(CLASS_NAME, "setSubFinalElement",
                      String.valueOf(subFinal));

    this.subFinal = subFinal;

@@ -1480,7 +1418,6 @@
   */
  public ASN1OctetString getNormalizedSubFinalElement()
  {
    assert debugEnter(CLASS_NAME, "getNormalizedSubFinalElement");

    if (normalizedSubFinal == null)
    {
@@ -1494,7 +1431,10 @@
        }
        catch (Exception e)
        {
          assert debugException(CLASS_NAME, "getNormalizedSubFinalElement", e);
          if (debugEnabled())
          {
            debugCought(DebugLogLevel.ERROR, e);
          }
        }
      }
    }
@@ -1512,7 +1452,6 @@
   */
  public String getMatchingRuleID()
  {
    assert debugEnter(CLASS_NAME, "getMatchingRuleID");

    return matchingRuleID;
  }
@@ -1527,8 +1466,6 @@
   */
  public void setMatchingRuleID(String matchingRuleID)
  {
    assert debugEnter(CLASS_NAME, "setMatchingRuleID",
                      String.valueOf(matchingRuleID));

    this.matchingRuleID = matchingRuleID;

@@ -1546,7 +1483,6 @@
   */
  public MatchingRule getMatchingRule()
  {
    assert debugEnter(CLASS_NAME, "getMatchingRule");

    if (matchingRule == null)
    {
@@ -1569,8 +1505,6 @@
   */
  public void setMatchingRule(MatchingRule matchingRule)
  {
    assert debugEnter(CLASS_NAME, "setMatchingRule",
                      String.valueOf(matchingRule));

    this.matchingRule = matchingRule;

@@ -1597,7 +1531,6 @@
   */
  public ApproximateMatchingRule getApproximateMatchingRule()
  {
    assert debugEnter(CLASS_NAME, "getApproximateMatchingRule");

    if (approximateMatchingRule == null)
    {
@@ -1622,7 +1555,6 @@
   */
  public EqualityMatchingRule getEqualityMatchingRule()
  {
    assert debugEnter(CLASS_NAME, "getEqualityMatchingRule");

    if (equalityMatchingRule == null)
    {
@@ -1647,7 +1579,6 @@
   */
  public OrderingMatchingRule getOrderingMatchingRule()
  {
    assert debugEnter(CLASS_NAME, "getOrderingMatchingRule");

    if (orderingMatchingRule == null)
    {
@@ -1672,7 +1603,6 @@
   */
  public SubstringMatchingRule getSubstringMatchingRule()
  {
    assert debugEnter(CLASS_NAME, "getSubstringMatchingRule");

    if (substringMatchingRule == null)
    {
@@ -1726,8 +1656,6 @@
   */
  public boolean valueMatches(AttributeType type, AttributeValue value)
  {
    assert debugEnter(CLASS_NAME, "valueMatches", String.valueOf(type),
                      String.valueOf(value));


    fullyDecode();
@@ -1747,7 +1675,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "valueMatches", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            return false;
          }
@@ -1773,7 +1704,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "valueMatches", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            return false;
          }
@@ -1797,7 +1731,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "valueMatches", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            return false;
          }
@@ -1821,7 +1758,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "valueMatches", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            return false;
          }
@@ -1853,7 +1793,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "valueMatches", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            return false;
          }
@@ -1890,7 +1833,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "valueMatches", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            return false;
          }
@@ -1910,7 +1856,10 @@
          }
          catch (Exception e)
          {
            assert debugException(CLASS_NAME, "valueMatches", e);
            if (debugEnabled())
            {
              debugCought(DebugLogLevel.ERROR, e);
            }

            return false;
          }
@@ -1932,7 +1881,6 @@
   */
  public String toString()
  {
    assert debugEnter(CLASS_NAME, "toString");

    StringBuilder buffer = new StringBuilder();
    toString(buffer);
@@ -1949,7 +1897,6 @@
   */
  public void toString(StringBuilder buffer)
  {
    assert debugEnter(CLASS_NAME, "toString", "java.lang.StringBuilder");

    switch (matchType)
    {

Diff truncated after the above file
opendj-sdk/opends/src/server/org/opends/server/controls/PagedResultsControl.java
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiredControl.java
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordExpiringControl.java
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyErrorType.java
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyRequestControl.java
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyResponseControl.java
opendj-sdk/opends/src/server/org/opends/server/controls/PasswordPolicyWarningType.java
opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchChangeType.java
opendj-sdk/opends/src/server/org/opends/server/controls/PersistentSearchControl.java
opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV1Control.java
opendj-sdk/opends/src/server/org/opends/server/controls/ProxiedAuthV2Control.java
opendj-sdk/opends/src/server/org/opends/server/controls/package-info.java
opendj-sdk/opends/src/server/org/opends/server/core/AbandonOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/AbsoluteSubtreeSpecification.java
opendj-sdk/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/AddOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/AuthenticatedUsers.java
opendj-sdk/opends/src/server/org/opends/server/core/BackendConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/BindOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/CertificateMapperConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/CompareOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/ConnectionHandlerConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/CoreConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/CoreConstants.java
opendj-sdk/opends/src/server/org/opends/server/core/DefaultAccessControlProvider.java
opendj-sdk/opends/src/server/org/opends/server/core/DeleteOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServerShutdownHook.java
opendj-sdk/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/GroupManager.java
opendj-sdk/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/KeyManagerProviderConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/LockFileManager.java
opendj-sdk/opends/src/server/org/opends/server/core/LoggerConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/ModifyDNOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/ModifyOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/MonitorConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/Operation.java
opendj-sdk/opends/src/server/org/opends/server/core/PasswordGeneratorConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicy.java
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfig.java
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/PasswordPolicyState.java
opendj-sdk/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/PersistentSearch.java
opendj-sdk/opends/src/server/org/opends/server/core/PluginConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/RFC3672SubtreeSpecification.java
opendj-sdk/opends/src/server/org/opends/server/core/RelativeSubtreeSpecification.java
opendj-sdk/opends/src/server/org/opends/server/core/RootDNConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/SASLConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/SchemaConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/SearchOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/ServerShutdownMonitor.java
opendj-sdk/opends/src/server/org/opends/server/core/SimpleSubtreeSpecification.java
opendj-sdk/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/TrustManagerProviderConfigManager.java
opendj-sdk/opends/src/server/org/opends/server/core/UnbindOperation.java
opendj-sdk/opends/src/server/org/opends/server/core/package-info.java
opendj-sdk/opends/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/Base64PasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/CancelExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/extensions/CertificateValidationPolicy.java
opendj-sdk/opends/src/server/org/opends/server/extensions/ClearPasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/ConfigFileHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/DefaultEntryCache.java
opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/DigestMD5StateInfo.java
opendj-sdk/opends/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/ExactMatchIdentityMapper.java
opendj-sdk/opends/src/server/org/opends/server/extensions/ExtensionsConstants.java
opendj-sdk/opends/src/server/org/opends/server/extensions/ExternalSASLMechanismHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/FIFOEntryCache.java
opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/FilteredStaticGroupMemberList.java
opendj-sdk/opends/src/server/org/opends/server/extensions/FingerprintCertificateMapper.java
opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/GSSAPIStateInfo.java
opendj-sdk/opends/src/server/org/opends/server/extensions/InternalConnectionSecurityProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/JMXAlertHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/LengthBasedPasswordValidator.java
opendj-sdk/opends/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/NullConnectionSecurityProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/PKCS11KeyManagerProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
opendj-sdk/opends/src/server/org/opends/server/extensions/RandomPasswordGenerator.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SimpleStaticGroupMemberList.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
opendj-sdk/opends/src/server/org/opends/server/extensions/StartTLSExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/extensions/StaticGroup.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
opendj-sdk/opends/src/server/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
opendj-sdk/opends/src/server/org/opends/server/extensions/TLSCapableConnection.java
opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkQueue.java
opendj-sdk/opends/src/server/org/opends/server/extensions/TraditionalWorkerThread.java
opendj-sdk/opends/src/server/org/opends/server/extensions/WhoAmIExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/extensions/package-info.java
opendj-sdk/opends/src/server/org/opends/server/interop/LazyDN.java
opendj-sdk/opends/src/server/org/opends/server/loggers/Access.java
opendj-sdk/opends/src/server/org/opends/server/loggers/ActionType.java
opendj-sdk/opends/src/server/org/opends/server/loggers/AsyncronousLogPublisher.java
opendj-sdk/opends/src/server/org/opends/server/loggers/Debug.java (deleted)
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAccessLogger.java
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryAuditLogger.java
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryDebugLogger.java (deleted)
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryErrorLogger.java
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileFormatter.java
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryFileHandler.java
opendj-sdk/opends/src/server/org/opends/server/loggers/DirectoryLogLevel.java
opendj-sdk/opends/src/server/org/opends/server/loggers/EncryptAction.java
opendj-sdk/opends/src/server/org/opends/server/loggers/Error.java
opendj-sdk/opends/src/server/org/opends/server/loggers/FileComparator.java
opendj-sdk/opends/src/server/org/opends/server/loggers/FileNamingPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/FixedTimeRotationPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/GZIPAction.java
opendj-sdk/opends/src/server/org/opends/server/loggers/InitializationErrorManager.java
opendj-sdk/opends/src/server/org/opends/server/loggers/LogCategory.java
opendj-sdk/opends/src/server/org/opends/server/loggers/LogErrorHandler.java
opendj-sdk/opends/src/server/org/opends/server/loggers/LogFileFilter.java
opendj-sdk/opends/src/server/org/opends/server/loggers/LogLevel.java
opendj-sdk/opends/src/server/org/opends/server/loggers/LogRecord.java
opendj-sdk/opends/src/server/org/opends/server/loggers/Logger.java
opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerAlarmHandler.java
opendj-sdk/opends/src/server/org/opends/server/loggers/LoggerThread.java
opendj-sdk/opends/src/server/org/opends/server/loggers/MeteredStream.java
opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
opendj-sdk/opends/src/server/org/opends/server/loggers/PostRotationAction.java
opendj-sdk/opends/src/server/org/opends/server/loggers/RetentionPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/RotationActionThread.java
opendj-sdk/opends/src/server/org/opends/server/loggers/RotationConfigUtil.java
opendj-sdk/opends/src/server/org/opends/server/loggers/RotationPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/SignatureAction.java
opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/StartupDebugLogger.java (deleted)
opendj-sdk/opends/src/server/org/opends/server/loggers/StartupErrorLogger.java
opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogFormatter.java
opendj-sdk/opends/src/server/org/opends/server/loggers/TextLogPublisher.java
opendj-sdk/opends/src/server/org/opends/server/loggers/TextWriter.java
opendj-sdk/opends/src/server/org/opends/server/loggers/TimeLimitRotationPolicy.java
opendj-sdk/opends/src/server/org/opends/server/loggers/TimeStampNaming.java
opendj-sdk/opends/src/server/org/opends/server/loggers/ZIPAction.java
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugErrorHandler.java
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogFormatter.java
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogRecord.java
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugStackTraceFormatter.java
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceConfiguration.java
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/TraceSettings.java
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/Tracer.java
opendj-sdk/opends/src/server/org/opends/server/loggers/package-info.java
opendj-sdk/opends/src/server/org/opends/server/messages/CoreMessages.java
opendj-sdk/opends/src/server/org/opends/server/messages/JebMessages.java
opendj-sdk/opends/src/server/org/opends/server/messages/LoggerMessages.java
opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java
opendj-sdk/opends/src/server/org/opends/server/messages/PluginMessages.java
opendj-sdk/opends/src/server/org/opends/server/messages/UtilityMessages.java
opendj-sdk/opends/src/server/org/opends/server/messages/package-info.java
opendj-sdk/opends/src/server/org/opends/server/monitors/BackendMonitor.java
opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java
opendj-sdk/opends/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
opendj-sdk/opends/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java
opendj-sdk/opends/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java
opendj-sdk/opends/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
opendj-sdk/opends/src/server/org/opends/server/monitors/VersionMonitorProvider.java
opendj-sdk/opends/src/server/org/opends/server/monitors/package-info.java
opendj-sdk/opends/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
opendj-sdk/opends/src/server/org/opends/server/plugins/LDAPADListPlugin.java
opendj-sdk/opends/src/server/org/opends/server/plugins/LastModPlugin.java
opendj-sdk/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
opendj-sdk/opends/src/server/org/opends/server/plugins/package-info.java
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStack.java
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileStackFrame.java
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/ProfilerThread.java
opendj-sdk/opends/src/server/org/opends/server/plugins/profiler/package-info.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Boolean.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Constants.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Element.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Enumerated.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Exception.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Integer.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Long.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Null.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1OctetString.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Reader.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Sequence.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Set.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/ASN1Writer.java
opendj-sdk/opends/src/server/org/opends/server/protocols/asn1/package-info.java
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalConnectionHandler.java
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchListener.java
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/InternalSearchOperation.java
opendj-sdk/opends/src/server/org/opends/server/protocols/internal/package-info.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/Credential.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIClientSocketFactory.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxClientConnection.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxConnector.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/OpendsRmiServerSocketFactory.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiAuthenticator.java
opendj-sdk/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPAttribute.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPConstants.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPControl.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPException.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPFilter.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPMessage.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPModification.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPResultCode.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/LDAPStatistics.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/ProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/UnbindRequestProtocolOp.java
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/package-info.java
opendj-sdk/opends/src/server/org/opends/server/protocols/package-info.java
opendj-sdk/opends/src/server/org/opends/server/schema/AbsoluteSubtreeSpecificationSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/AttributeTypeSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordExactEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/AuthPasswordSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/BinarySyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/BitStringSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/BooleanSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactOrderingMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseExactSubstringMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreListSubstringMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/CertificateListSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/CertificatePairSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/CertificateSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/CountryStringSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/DITContentRuleSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/DirectoryStringSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/DoubleMetaphoneApproximateMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/FaxNumberSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/FaxSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/GuideSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/IA5StringSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/IntegerSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/JPEGSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/KeywordEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/NameFormSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/NumericStringSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/OIDSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/ObjectClassSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/ObjectIdentifierFirstComponentEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringOrderingMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSubstringMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/OctetStringSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/OtherMailboxSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/PostalAddressSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/PresentationAddressSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/PrintableString.java
opendj-sdk/opends/src/server/org/opends/server/schema/PrintableStringSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/RFC3672SubtreeSpecificationSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/RelativeSubtreeSpecificationSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/SchemaConstants.java
opendj-sdk/opends/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSubstringMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/TelexNumberSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/UTCTimeSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/UUIDSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordExactEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/UserPasswordSyntax.java
opendj-sdk/opends/src/server/org/opends/server/schema/WordEqualityMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/schema/package-info.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageList.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/AckMessageListComparator.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogAckMessageList.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDBException.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogData.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogDbEnv.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIterator.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogIteratorComparator.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ChangelogKey.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/MsgQueue.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerReader.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerWriter.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/UpdateComparator.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/package-info.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ChangeNumber.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/common/ServerState.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/common/package-info.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/package-info.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/AttrInfoWithOptions.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperation.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/FakeOperationComparator.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HeartbeatMonitor.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistKey.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistVal.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/Historical.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/HistoricalCsnOrderingMatchingRule.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ListenerThread.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ModifyFakeOperation.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/MultimasterSynchronization.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/PendingChange.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/SynchronizationMonitor.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/ValueInfo.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/plugin/package-info.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AckMessage.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddContext.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/AddMsg.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ChangelogStartMessage.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteContext.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/DeleteMsg.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/HeartbeatThread.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyContext.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDNMsg.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyDnContext.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ModifyMsg.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/OperationContext.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ProtocolSession.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/ServerStartMessage.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SocketSession.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/SynchronizationMessage.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/UpdateMessage.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/WindowMessage.java
opendj-sdk/opends/src/server/org/opends/server/synchronization/protocol/package-info.java
opendj-sdk/opends/src/server/org/opends/server/tasks/AddSchemaFileTask.java
opendj-sdk/opends/src/server/org/opends/server/tasks/BackupTask.java
opendj-sdk/opends/src/server/org/opends/server/tasks/ExportTask.java
opendj-sdk/opends/src/server/org/opends/server/tasks/ImportTask.java
opendj-sdk/opends/src/server/org/opends/server/tasks/RestartTaskThread.java
opendj-sdk/opends/src/server/org/opends/server/tasks/RestoreTask.java
opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTask.java
opendj-sdk/opends/src/server/org/opends/server/tasks/ShutdownTaskThread.java
opendj-sdk/opends/src/server/org/opends/server/tasks/TaskUtils.java
opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
opendj-sdk/opends/src/server/org/opends/server/tools/ClientException.java
opendj-sdk/opends/src/server/org/opends/server/tools/ConfigureDS.java
opendj-sdk/opends/src/server/org/opends/server/tools/EncodePassword.java
opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompareOptions.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnection.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionException.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPConnectionOptions.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDeleteOptions.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModifyOptions.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearchOptions.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolOptions.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPToolUtils.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDIFDiff.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDIFModify.java
opendj-sdk/opends/src/server/org/opends/server/tools/LDIFSearch.java
opendj-sdk/opends/src/server/org/opends/server/tools/ListBackends.java
opendj-sdk/opends/src/server/org/opends/server/tools/PromptTrustManager.java
opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionException.java
opendj-sdk/opends/src/server/org/opends/server/tools/SSLConnectionFactory.java
opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
opendj-sdk/opends/src/server/org/opends/server/tools/ToolConstants.java
opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
opendj-sdk/opends/src/server/org/opends/server/tools/WaitForFileDelete.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/AttributeValueTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Branch.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/DNTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/EntryWriter.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FileTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/FirstNameTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/GUIDTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfAbsentTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/IfPresentTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/LastNameTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIF.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFException.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStream.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/MakeLDIFInputStreamThread.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/ParentDNTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/PresenceTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RDNTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/RandomTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/SequentialTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/StaticTextTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Tag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TagResult.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/Template.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateFile.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateLine.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/TemplateValue.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreDNTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/makeldif/UnderscoreParentDNTag.java
opendj-sdk/opends/src/server/org/opends/server/tools/package-info.java
opendj-sdk/opends/src/server/org/opends/server/types/AcceptRejectWarn.java
opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotification.java
opendj-sdk/opends/src/server/org/opends/server/types/AccountStatusNotificationType.java
opendj-sdk/opends/src/server/org/opends/server/types/AddressMask.java
opendj-sdk/opends/src/server/org/opends/server/types/Attribute.java
opendj-sdk/opends/src/server/org/opends/server/types/AttributeType.java
opendj-sdk/opends/src/server/org/opends/server/types/AttributeUsage.java
opendj-sdk/opends/src/server/org/opends/server/types/AttributeValue.java
opendj-sdk/opends/src/server/org/opends/server/types/AttributeValueIterable.java
opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationInfo.java
opendj-sdk/opends/src/server/org/opends/server/types/AuthenticationType.java
opendj-sdk/opends/src/server/org/opends/server/types/BackupConfig.java
opendj-sdk/opends/src/server/org/opends/server/types/BackupDirectory.java
opendj-sdk/opends/src/server/org/opends/server/types/BackupInfo.java
opendj-sdk/opends/src/server/org/opends/server/types/ByteString.java
opendj-sdk/opends/src/server/org/opends/server/types/ByteStringFactory.java
opendj-sdk/opends/src/server/org/opends/server/types/CacheEntry.java
opendj-sdk/opends/src/server/org/opends/server/types/CancelRequest.java
opendj-sdk/opends/src/server/org/opends/server/types/CancelResult.java
opendj-sdk/opends/src/server/org/opends/server/types/CancelledOperationException.java
opendj-sdk/opends/src/server/org/opends/server/types/CommonSchemaElements.java
opendj-sdk/opends/src/server/org/opends/server/types/ConfigChangeResult.java
opendj-sdk/opends/src/server/org/opends/server/types/Control.java
opendj-sdk/opends/src/server/org/opends/server/types/CryptoManager.java
opendj-sdk/opends/src/server/org/opends/server/types/DITContentRule.java
opendj-sdk/opends/src/server/org/opends/server/types/DITStructureRule.java
opendj-sdk/opends/src/server/org/opends/server/types/DN.java
opendj-sdk/opends/src/server/org/opends/server/types/DebugLogCategory.java (deleted)
opendj-sdk/opends/src/server/org/opends/server/types/DebugLogLevel.java
opendj-sdk/opends/src/server/org/opends/server/types/DebugLogSeverity.java (deleted)
opendj-sdk/opends/src/server/org/opends/server/types/DereferencePolicy.java
opendj-sdk/opends/src/server/org/opends/server/types/DirectoryConfig.java
opendj-sdk/opends/src/server/org/opends/server/types/DirectoryException.java
opendj-sdk/opends/src/server/org/opends/server/types/DisconnectReason.java
opendj-sdk/opends/src/server/org/opends/server/types/Entry.java
opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogCategory.java
opendj-sdk/opends/src/server/org/opends/server/types/ErrorLogSeverity.java
opendj-sdk/opends/src/server/org/opends/server/types/ExistingFileBehavior.java
opendj-sdk/opends/src/server/org/opends/server/types/FilePermission.java
opendj-sdk/opends/src/server/org/opends/server/types/FilterType.java
opendj-sdk/opends/src/server/org/opends/server/types/HostPort.java
opendj-sdk/opends/src/server/org/opends/server/types/InitializationException.java
opendj-sdk/opends/src/server/org/opends/server/types/IntermediateResponse.java
opendj-sdk/opends/src/server/org/opends/server/types/InvokableMethod.java
opendj-sdk/opends/src/server/org/opends/server/types/LDAPURL.java
opendj-sdk/opends/src/server/org/opends/server/types/LDIFExportConfig.java
opendj-sdk/opends/src/server/org/opends/server/types/LDIFImportConfig.java
opendj-sdk/opends/src/server/org/opends/server/types/LockManager.java
opendj-sdk/opends/src/server/org/opends/server/types/LockType.java
opendj-sdk/opends/src/server/org/opends/server/types/MatchingRuleUse.java
opendj-sdk/opends/src/server/org/opends/server/types/MemberList.java
opendj-sdk/opends/src/server/org/opends/server/types/MembershipException.java
opendj-sdk/opends/src/server/org/opends/server/types/Modification.java
opendj-sdk/opends/src/server/org/opends/server/types/ModificationType.java
opendj-sdk/opends/src/server/org/opends/server/types/NameForm.java
opendj-sdk/opends/src/server/org/opends/server/types/NamedCharacterSet.java
opendj-sdk/opends/src/server/org/opends/server/types/NullOutputStream.java
opendj-sdk/opends/src/server/org/opends/server/types/ObjectClass.java
opendj-sdk/opends/src/server/org/opends/server/types/ObjectClassType.java
opendj-sdk/opends/src/server/org/opends/server/types/OperationType.java
opendj-sdk/opends/src/server/org/opends/server/types/RDN.java
opendj-sdk/opends/src/server/org/opends/server/types/RestoreConfig.java
opendj-sdk/opends/src/server/org/opends/server/types/ResultCode.java
opendj-sdk/opends/src/server/org/opends/server/types/SSLClientAuthPolicy.java
opendj-sdk/opends/src/server/org/opends/server/types/Schema.java
opendj-sdk/opends/src/server/org/opends/server/types/SearchFilter.java
opendj-sdk/opends/src/server/org/opends/server/types/SearchResultEntry.java
opendj-sdk/opends/src/server/org/opends/server/types/SearchResultReference.java
opendj-sdk/opends/src/server/org/opends/server/types/SearchScope.java
opendj-sdk/opends/src/server/org/opends/server/types/SynchronizationProviderResult.java
opendj-sdk/opends/src/server/org/opends/server/types/WritabilityMode.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/InProgressOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PluginOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAbandonOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationAddOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationBindOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationCompareOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationDeleteOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyDNOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationModifyOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationSearchOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostOperationUnbindOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseAddOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseBindOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseCompareOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseDeleteOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyDNOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseModifyOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PostResponseSearchOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationAddOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationBindOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationCompareOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationDeleteOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyDNOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationModifyOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreOperationOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAbandonOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseAddOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseBindOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseCompareOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseDeleteOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseExtendedOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyDNOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseModifyOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/PreParseUnbindOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchEntrySearchOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/SearchReferenceSearchOperation.java
opendj-sdk/opends/src/server/org/opends/server/types/operation/package-info.java
opendj-sdk/opends/src/server/org/opends/server/util/AddChangeRecordEntry.java
opendj-sdk/opends/src/server/org/opends/server/util/Base64.java
opendj-sdk/opends/src/server/org/opends/server/util/ChangeOperationType.java
opendj-sdk/opends/src/server/org/opends/server/util/ChangeRecordEntry.java
opendj-sdk/opends/src/server/org/opends/server/util/DeleteChangeRecordEntry.java
opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
opendj-sdk/opends/src/server/org/opends/server/util/LDIFException.java
opendj-sdk/opends/src/server/org/opends/server/util/LDIFReader.java
opendj-sdk/opends/src/server/org/opends/server/util/LDIFWriter.java
opendj-sdk/opends/src/server/org/opends/server/util/ModifyChangeRecordEntry.java
opendj-sdk/opends/src/server/org/opends/server/util/ModifyDNChangeRecordEntry.java
opendj-sdk/opends/src/server/org/opends/server/util/MultiOutputStream.java
opendj-sdk/opends/src/server/org/opends/server/util/PasswordReader.java
opendj-sdk/opends/src/server/org/opends/server/util/ServerConstants.java
opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java
opendj-sdk/opends/src/server/org/opends/server/util/TimeThread.java
opendj-sdk/opends/src/server/org/opends/server/util/Validator.java
opendj-sdk/opends/src/server/org/opends/server/util/args/Argument.java
opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentException.java
opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
opendj-sdk/opends/src/server/org/opends/server/util/args/BooleanArgument.java
opendj-sdk/opends/src/server/org/opends/server/util/args/FileBasedArgument.java
opendj-sdk/opends/src/server/org/opends/server/util/args/IntegerArgument.java
opendj-sdk/opends/src/server/org/opends/server/util/args/MultiChoiceArgument.java
opendj-sdk/opends/src/server/org/opends/server/util/args/StringArgument.java
opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommand.java
opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
opendj-sdk/opends/src/server/org/opends/server/util/args/package-info.java
opendj-sdk/opends/src/server/org/opends/server/util/package-info.java
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
New file
			@@ -0,0 +1,91 @@
			<html>

			<head>
			<title>AspectJ License</title>


			</head>

			<BODY BGCOLOR="white">

			<h2 align="center"><b>AspectJ<sup><small>TM</small></sup>
			Compiler and Core Tools License</b></h2>

			<p>This is a binary-only release.  Source code
			is available from
			<a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a></p>

			<p>The Eclipse Foundation makes available all content in this distribution ("Content").
			Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
			Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
			at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
			For purposes of the EPL, "Program" will mean the Content.</p>

			<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
			being redistributed by another party ("Redistributor") and different terms and conditions may
			apply to your use of any object code in the Content. Check the Redistributor's license
			that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
			indicated below, the terms and conditions of the EPL still apply to any source code in the Content
			and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>


			<h3>Third Party Content</h3>
			<p>The Content includes items that have been sourced from third parties as set out below. If you
			did not receive this Content directly from the Eclipse Foundation, the following is provided
			for informational purposes only, and you should look to the Redistributor?s license for
			terms and conditions of use.</p>
			<em>

			<h4>BCEL v5.1</h4>
			<p>This product contains software developed by the
			Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p>

			<p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1.
			BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source
			code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code
			is made available under the Apache Software License v1.1</p>

			<h4>ASM v2.2.1</h4>
			<p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>)
			The source code for ASM is available from the ObjectWeb download site at
			<a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>.
			<p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>.
			The license is also reproduced here:
			</p>

			<pre>Copyright (c) 2000-2005 INRIA, France Telecom
			All rights reserved.

			Redistribution and use in source and binary forms, with or without
			modification, are permitted provided that the following conditions
			are met:

			1. Redistributions of source code must retain the above copyright
			notice, this list of conditions and the following disclaimer.

			2. Redistributions in binary form must reproduce the above copyright
			notice, this list of conditions and the following disclaimer in the
			documentation and/or other materials provided with the distribution.

			3. Neither the name of the copyright holders nor the names of its
			contributors may be used to endorse or promote products derived from
			this software without specific prior written permission.

			THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
			AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
			IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
			ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
			LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
			CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
			SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
			INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
			CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
			ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
			THE POSSIBILITY OF SUCH DAMAGE.
			</pre>

			</em>

			</body>

			</html>
New file
			@@ -0,0 +1,346 @@
			<html>

			<head>
			<meta http-equiv="Content-Language" content="en-us">
			<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
			<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
			<meta name="ProgId" content="FrontPage.Editor.Document">
			<title>AspectJ Readme</title>
			<STYLE TYPE="text/css">
			<!--

			/* FOR THE SDA PAGE */

			/*
			BODY {margin-top: 15px; margin-left: 15px; margin-right: 15px;}
			*/

			A:link {
			color:#4756AC;
			}
			A:visited {
			color:#60657B;
			}
			A:hover {
			color:red
			}

			INPUT {font:12px "Courier New", sans-serif;}

			H2 {
			font:18px/18px Verdana, Arial, Helvetica, sans-serif;
			color:black;
			font-weight:bold;
			margin-left: 10px;
			line-height:110%;
			}
			H3 {
			font:18px/18px Verdana, Arial, Helvetica, sans-serif;
			color:black;
			font-weight:bold;
			margin-left: 10px;
			line-height:110%;
			}
			H4 {
			font:15px/16px Verdana, Arial, Helvetica, sans-serif;
			color:black;
			font-weight:bold;
			margin-left: 10px;
			line-height:140%;
			}
			P {
			font:13px/13px Verdana, Arial, Helvetica, sans-serif;
			margin-right: 10px;
			margin-left: 10px;
			line-height:130%;
			}
			.paragraph {
			font:13px/13px Verdana, Arial, Helvetica, sans-serif;
			margin-right: 10px;
			margin-left: 10px;
			line-height:130%;
			}
			.smallParagraph {
			font:11px/11px Verdana, Arial, Helvetica, sans-serif;
			margin-right: 10px;
			margin-left: 10px;
			line-height:130%;
			}
			/*
			LI {
			font:13px/13px Verdana, Arial, Helvetica, sans-serif;
			text-align:justify;
			margin-right: 10px;
			margin-left: 15px;
			line-height:120%;
			}

			UL {
			font:13px/13px Verdana, Arial, Helvetica, sans-serif;
			text-align:justify;
			margin-right: 10px;
			margin-left: 15px;
			line-height:120%;
			}*/

			DL {
			font:13px/13px Verdana, Arial, Helvetica, sans-serif;
			text-align:justify;
			margin-right: 10px;
			margin-left: 15px;
			line-height:120%;
			}
			B { font:13px/13px Verdana, Arial, Helvetica, sans-serif;
			font-weight:bold;
			line-height:140%;
			}
			.footer {
			font:10px/10px Verdana, Arial, Helvetica, sans-serif;
			color:#888888;
			text-align:left
			}
			.figureTitle {
			font:13px/13px Verdana, Arial, Helvetica, sans-serif;
			text-align:justify;
			text-align:center
			}
			.copyrightNotice {
			font:10px/10px Verdana, Arial, Helvetica, sans-serif;
			color:#999999;
			line-height:110%;
			}
			.smallHeading {
			font:13px/13px Verdana, Arial, Helvetica, sans-serif;
			font-weight:bold;
			line-height:110%;
			}
			.tinyHeading {
			font:11px/11px Verdana, Arial, Helvetica, sans-serif;
			font-weight:bold;
			line-height:120%;
			}
			.newsText {
			font:11px/11px Verdana, Arial, Helvetica, sans-serif;
			line-height:130%;
			}
			.smallParagraph {
			font:11px/11px Verdana, Arial, Helvetica, sans-serif;
			line-height:130%;
			}
			.fancyHeading {
			font:20px/20px Chantilly, Arial, Helvetica, sans-serif;
			margin-right: 10px;
			color:#6f7a92;
			margin-left: 10px;
			line-height:130%;
			}

			-->
			</STYLE>
			</head>

			<BODY BGCOLOR="white">

			<h2 align="center">AspectJ<sup><small>TM</small></sup></h2>

			<p align="center"><i>Version 1.5.3 released on Wednesday Nov 22, 2006.</i></p>

			<h3>1 Contents of this Package</h3>

			<UL>
			<li>the <a href="bin"><CODE><aspectj install dir>/bin</CODE></a>
			directory has scripts for
			<ul>
			<li><CODE>ajc</CODE>: the compiler for the AspectJ language</li>

			<!-- XXX removed references to ajdoc and ajdb -->
			<li><CODE>ajbrowser</CODE>: a graphical editor for
			compiling programs with <CODE>ajc</CODE>
			and navigating the crosscutting structure of those programs</li>
			</ul>

			<li>the directory <a href="lib"><CODE><aspectj install dir>/lib</CODE></a>
			has the AspectJ binaries,
			<ul>
			<li><CODE><a href="lib/aspectjtools.jar">aspectjtools.jar</a></CODE>: libraries for
			<code>ajc</code>, <code>ajbrowser</code>, and the Ant tasks</li>

			<li><CODE>aspectjrt.jar</CODE>: runtime library for AspectJ programs</li>
			</ul>
			</li>
			<li>the directory <a href="doc"><CODE><aspectj install dir>/doc</CODE></a>
			has examples, programming and development environment guides,
			instructions for the Ant tasks, a README for 1.1 changes,
			and a quick reference, all linked
			from the <a href="doc/index.html">index</a> page.
			</li>
			<li>this <a href="README-AspectJ.html">README-AspectJ.html</a>, and
			</li>
			<li>the <a href="LICENSE-AspectJ.html">LICENSE-AspectJ.html</a>
			applying to this distribution.
			</li>
			</UL>

			<hr>

			<h3>2 Install Procedure</h3>

			<p>The AspectJ tools <code>ajc</code> and <code>ajbrowser</code> are
			Java programs that can be run indirectly from the scripts or
			directly from <code>aspectjtools.jar</code>.
			The <code>aspectjrt.jar</code> needs to be on the classpath
			when compiling or running programs compiled
			by <code>ajc</code>. This procedure shows ways to do that.
			</p>

			<p>After finishing automatic installation, we recommend that the
			following steps to complete your installation:</p>

			<p><b>2.1 Add <CODE><aspectj install dir>/lib/aspectjrt.jar</CODE>
			to your class path</b></p>

			<blockquote>
			<p>This small .jar file contains classes required to compile programs
			with the ajc compiler, and to run programs compiled with the ajc
			compiler. You must have these classes somewhere on your class path
			when running programs compiled with ajc. For detailed instructions
			please see the <a href="#configInstructions">Configuration
			Instructions</a> at the bottom of this document.</p>
			</blockquote>

			<p><b>2.2 Put the AspectJ <code>bin</code> directory on your PATH</b></p>

			<blockquote>
			<p>Modify your PATH to include <code><b><aspectj install
			dir>/bin</b></code>. This will make it easier to run ajc.
			For detailed instructions please see the
			<a href="#configInstructions">Configuration Instructions</a> at the
			bottom of this document.</p>
			</blockquote>

			<p><b>2.3 Review the documentation and examples </b></p>

			<blockquote>
			<p>Development and programming guides
			are available in <a href="doc/index.html">docs</a>,
			and example programs and an Ant script are available in
			<a href="doc/examples/">examples</a>.
			</blockquote>

			<p>If you did not use the automatic installation process, you may wish
			to create short launch scripts to start ajc easily (section 3).</p>

			<hr>

			<h3>3. Running the Tools</h3>

			<p>If you did not use the automatic installation process or the
			default launch scripts do not work on your system, you may wish to
			create short launch scripts to start ajc easily. </p>

			<p>You can also run the <code>aspectjtools.jar</code> directly
			using java's -jar option:

			<blockquote>
			<CODE>C:\jdk1.3\bin\java.exe -jar D:\aspectj\lib\aspectjtools.jar %*</CODE>
			</blockquote>

			<p>With no arguments or only argument list (.lst) files, this will launch
			<code>ajbrowser</code>, the GUI structure browser; otherwise, it will
			run <code>ajc</code>, the AspectJ compiler. This means that
			if your browser is set up to run jar files, clicking a link
			to <a href="lib/aspectjtools.jar">lib/aspectjtools.jar</a> will
			launch <code>ajbrowser</code>.

			<p> You can also create scripts like those created by the installer.
			These scripts use full paths that are system dependent so you will
			likely have to change these. </p>

			<p>Here's a sample launch script for WinNT and Win2K (note that this
			is single line in the .bat file):</p>

			<blockquote>
			<CODE>C:\jdk1.3\bin\java.exe -classpath D:\aspectj\lib\aspectjtools.jar -Xmx64M
			org.aspectj.tools.ajc.Main %*</CODE>
			</blockquote>

			<p>Here's a sample launch script for a Unix shell (on Linux using Sun's JDK1.3):</p>

			<blockquote>
			<CODE>/usr/java/jdk1.3/jre/bin/java -classpath /home/aspectj/lib/aspectjtools.jar -Xmx64M org.aspectj.tools.ajc.Main "$@"</CODE>
			</blockquote>

			<hr>
			<h3><a name="configInstructions">4. Configuration Instructions</a></h3>

			<h4>4.1 Adding <code><aspectj install dir>/lib/aspectjrt.jar</code> to your classpath</h4>

			<p>There are several ways to add this jar file to your classpath:</p>

			<ul>
			<li>
			copy <code>aspectjrt.jar</code> to the <code>jdk/jre/lib/ext</code> directory</li>
			<li>
			add <code>aspectjrt.jar</code> to your CLASSPATH
			environment variable (see the next section for details)</li>
			<li>
			always use the "<code>-classpath aspectjrt.jar</code>" option when running
			programs compiled with ajc</li>
			</ul>
			<h4>4.2 <A NAME="6.1">Setting the Environment Variables on Windows</A></h4>

			<P>The following instructions use the PATH variable as an example, but
			this process is identical for the CLASSPATH variable. </P>

			<P>You can do the variables permanently for all the shells that you
			will run or temporarily only for the current shell. To change the
			PATH only in the current shell, and assuming you've installed AspectJ
			in <code>C:\apps\aspectj</code>, type:</P>

			<blockquote><code>> set PATH=%PATH%;C:\apps\aspectj\bin</code></blockquote>

			<P><b>Changing Environment Variables Permanently on WinNT and Win2000</b>
			<ul>
			<li>
			<p class="paragraph">open the Environment Variables dialog
			<ul>
			<li>
			<p class="paragraph">WinNT: in "Control Panels" double-click
			"System" and select the "Environment" tab</li>
			<li>
			<p class="paragraph">Win2K: in "Control Panels" double-click
			"System", select the "Advanced" tab and click the
			"Environment Variables..." button</li>
			</ul>
			</li>
			<li>
			<p class="paragraph">select the environment variable for editing, or add it
			using the "New..." button if it does not exist</li>
			<li>
			<p class="paragraph">add the new entry separated from the others by a
			semi-colon (;) and close the dialog</li>
			<li>
			<p class="paragraph">note that the change will not affect shells that were
			already running </li>
			</ul>
			<P><b>Changing Environment Variables Permanently on Win9x</b>
			<ul>
			<li>
			<p class="paragraph">open the AUTOEXEC.BAT with an editor such as NotePad</li>

			<LI>
			<p class="paragraph">edit the PATH statement to include the new entry and save
			the file, e.g.<BR>

			<blockquote>
			<CODE>PATH C:\WINDOWS;C:\WINDOWS\COMMAND;C:\;C:\DOS;C:\apps\aspectj\bin</CODE>
			</blockquote>
			</LI>
			<LI>
			<p class="paragraph">note that the change will not affect shells that were
			already running
			</ul>

			</body>

			</html>
New file
			@@ -0,0 +1,10 @@
			#!/bin/sh
			# This file generated by AspectJ installer
			# Created on Mon Jan 22 08:32:55 CST 2007 by bl155526

			if [ "$JAVA_HOME" = "" ] ; then JAVA_HOME=/usr/jdk/instances/jdk1.5.0
			fi
			if [ "$ASPECTJ_HOME" = "" ] ; then ASPECTJ_HOME=/home/bl155526/aspectj1.5
			fi

			"$JAVA_HOME/bin/java" -classpath "$ASPECTJ_HOME/lib/aspectjweaver.jar" "-Djava.system.class.loader=org.aspectj.weaver.loadtime.WeavingURLClassLoader" "-Daj.class.path=$ASPECTPATH:$CLASSPATH" "-Daj.aspect.path=$ASPECTPATH" "$@"
			@@ -22,7 +22,7 @@
			* CDDL HEADER END
			*
			*
			* Portions Copyright 2006 Sun Microsystems, Inc.
			* Portions Copyright 2006-2007 Sun Microsystems, Inc.
			*/
			package org.opends.dsml.protocol;
			@@ -61,7 +61,11 @@
			import org.opends.server.util.TimeThread;

			import static org.opends.server.config.ConfigConstants.*;
			import static org.opends.server.loggers.Debug.*;
			import static
			org.opends.server.loggers.debug.DebugLogger.debugCought;
			import static
			org.opends.server.loggers.debug.DebugLogger.debugEnabled;
			import org.opends.server.types.DebugLogLevel;
			import static org.opends.server.loggers.Error.*;
			import static org.opends.server.messages.CoreMessages.*;
			import static org.opends.server.messages.MessageHandler.*;
			@@ -75,11 +79,6 @@
			*/
			public abstract class ClientConnection
			{
			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.api.ClientConnection";



			@@ -129,7 +128,6 @@
			*/
			protected ClientConnection()
			{
			assert debugConstructor(CLASS_NAME);

			connectTime = TimeThread.getTime();
			connectTimeString = TimeThread.getUTCTime();
			@@ -195,8 +193,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "finalizeConnectionInternal",
			e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}

			@@ -227,7 +227,6 @@
			*/
			public long getConnectTime()
			{
			assert debugEnter(CLASS_NAME, "getConnectTime");

			return connectTime;
			}
			@@ -243,7 +242,6 @@
			*/
			public String getConnectTimeString()
			{
			assert debugEnter(CLASS_NAME, "getConnectTimeString");

			return connectTimeString;
			}
			@@ -462,8 +460,6 @@
			public final boolean sendIntermediateResponse(
			IntermediateResponse intermediateResponse)
			{
			assert debugEnter(CLASS_NAME, "sendIntermediateResponse",
			String.valueOf(intermediateResponse));


			// Invoke the intermediate response plugins for the response
			@@ -526,11 +522,6 @@
			boolean sendNotification,
			int messageID, Object... arguments)
			{
			assert debugEnter(CLASS_NAME, "disconnect",
			String.valueOf(disconnectReason),
			String.valueOf(sendNotification),
			String.valueOf(messageID),
			String.valueOf(arguments));

			String message = getMessage(messageID, arguments);
			disconnect(disconnectReason, sendNotification, message,
			@@ -581,7 +572,6 @@
			*/
			public boolean bindInProgress()
			{
			assert debugEnter(CLASS_NAME, "bindInProgress");

			return bindInProgress;
			}
			@@ -598,8 +588,6 @@
			*/
			public void setBindInProgress(boolean bindInProgress)
			{
			assert debugEnter(CLASS_NAME, "setBindInProgress",
			String.valueOf(bindInProgress));

			this.bindInProgress = bindInProgress;
			}
			@@ -618,7 +606,6 @@
			*/
			public boolean mustChangePassword()
			{
			assert debugEnter(CLASS_NAME, "mustChangePassword");

			if (authenticationInfo == null)
			{
			@@ -644,8 +631,6 @@
			*/
			public void setMustChangePassword(boolean mustChangePassword)
			{
			assert debugEnter(CLASS_NAME, "setMustChangePassword",
			String.valueOf(mustChangePassword));

			if (authenticationInfo == null)
			{
			@@ -709,7 +694,6 @@
			public CopyOnWriteArrayList<PersistentSearch>
			getPersistentSearches()
			{
			assert debugEnter(CLASS_NAME, "getPersistentSearches");

			return persistentSearches;
			}
			@@ -728,8 +712,6 @@
			public void registerPersistentSearch(PersistentSearch
			persistentSearch)
			{
			assert debugEnter(CLASS_NAME, "registerPersistentSearch",
			String.valueOf(persistentSearch));

			persistentSearches.add(persistentSearch);
			}
			@@ -748,8 +730,6 @@
			public void deregisterPersistentSearch(PersistentSearch
			persistentSearch)
			{
			assert debugEnter(CLASS_NAME, "deregisterPersistentSearch",
			String.valueOf(persistentSearch));

			persistentSearches.remove(persistentSearch);
			}
			@@ -806,7 +786,6 @@
			*/
			public AuthenticationInfo getAuthenticationInfo()
			{
			assert debugEnter(CLASS_NAME, "getAuthenticationInfo");

			return authenticationInfo;
			}
			@@ -825,8 +804,6 @@
			public void setAuthenticationInfo(AuthenticationInfo
			authenticationInfo)
			{
			assert debugEnter(CLASS_NAME, "setAuthenticationInfo",
			String.valueOf(authenticationInfo));

			if (this.authenticationInfo != null)
			{
			@@ -916,9 +893,6 @@
			*/
			public void updateAuthenticationInfo(Entry oldEntry, Entry newEntry)
			{
			assert debugEnter(CLASS_NAME, "updateAuthenticationInfo",
			String.valueOf(oldEntry),
			String.valueOf(newEntry));

			Entry authNEntry = authenticationInfo.getAuthenticationEntry();
			Entry authZEntry = authenticationInfo.getAuthorizationEntry();
			@@ -958,7 +932,6 @@
			*/
			public void setUnauthenticated()
			{
			assert debugEnter(CLASS_NAME, "setUnauthenticated");

			this.authenticationInfo = new AuthenticationInfo();
			this.sizeLimit = DirectoryServer.getSizeLimit();
			@@ -984,9 +957,6 @@
			public boolean hasPrivilege(Privilege privilege,
			Operation operation)
			{
			assert debugEnter(CLASS_NAME, "hasPrivilege",
			String.valueOf(privilege),
			String.valueOf(operation));

			boolean result = privileges.contains(privilege);
			if (operation == null)
			@@ -1035,9 +1005,6 @@
			public boolean hasAllPrivileges(Privilege[] privileges,
			Operation operation)
			{
			assert debugEnter(CLASS_NAME, "hasAllPrivileges",
			String.valueOf(privileges),
			String.valueOf(operation));

			HashSet<Privilege> privSet = this.privileges;
			boolean result = true;
			@@ -1103,8 +1070,6 @@
			*/
			private void updatePrivileges(Entry entry, boolean isRoot)
			{
			assert debugEnter(CLASS_NAME, "updatePrivileges",
			String.valueOf(entry));

			HashSet<Privilege> newPrivileges = new HashSet<Privilege>();
			HashSet<Privilege> removePrivileges = new HashSet<Privilege>();
			@@ -1183,7 +1148,6 @@
			*/
			public final Object getSASLAuthStateInfo()
			{
			assert debugEnter(CLASS_NAME, "getSASLAuthStateInfo");

			return saslAuthState;
			}
			@@ -1200,8 +1164,6 @@
			*/
			public final void setSASLAuthStateInfo(Object saslAuthState)
			{
			assert debugEnter(CLASS_NAME, "setSASLAuthStateInfo",
			String.valueOf(saslAuthState));

			this.saslAuthState = saslAuthState;
			}
			@@ -1217,7 +1179,6 @@
			*/
			public final int getSizeLimit()
			{
			assert debugEnter(CLASS_NAME, "getSizeLimit");

			return sizeLimit;
			}
			@@ -1234,8 +1195,6 @@
			*/
			public final void setSizeLimit(int sizeLimit)
			{
			assert debugEnter(CLASS_NAME, "setSizeLimit",
			String.valueOf(sizeLimit));

			this.sizeLimit = sizeLimit;
			}
			@@ -1251,7 +1210,6 @@
			*/
			public final int getLookthroughLimit()
			{
			assert debugEnter(CLASS_NAME, "getLookthroughLimit");

			return lookthroughLimit;
			}
			@@ -1268,8 +1226,6 @@
			*/
			public final void setLookthroughLimit(int lookthroughLimit)
			{
			assert debugEnter(CLASS_NAME, "setLookthroughLimit",
			String.valueOf(lookthroughLimit));

			this.lookthroughLimit = lookthroughLimit;
			}
			@@ -1285,7 +1241,6 @@
			*/
			public final int getTimeLimit()
			{
			assert debugEnter(CLASS_NAME, "getTimeLimit");

			return timeLimit;
			}
			@@ -1302,8 +1257,6 @@
			*/
			public final void setTimeLimit(int timeLimit)
			{
			assert debugEnter(CLASS_NAME, "setTimeLimit",
			String.valueOf(timeLimit));

			this.timeLimit = timeLimit;
			}
			@@ -1352,8 +1305,6 @@
			public boolean isMemberOf(Group group, Operation operation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "isMemberOf", String.valueOf(group),
			String.valueOf(operation));

			if (operation == null)
			{
			@@ -1392,8 +1343,6 @@
			public Set<Group> getGroups(Operation operation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "getGroups",
			String.valueOf(operation));


			// FIXME -- This probably isn't the most efficient implementation.
			@@ -1456,7 +1405,6 @@
			*/
			public DN getKeyManagerProviderDN()
			{
			assert debugEnter(CLASS_NAME, "getKeyManagerProviderDN");

			// In the default implementation, we'll return null.
			return null;
			@@ -1479,7 +1427,6 @@
			*/
			public DN getTrustManagerProviderDN()
			{
			assert debugEnter(CLASS_NAME, "getTrustManagerProviderDN");

			// In the default implementation, we'll return null.
			return null;
			@@ -1512,7 +1459,6 @@
			*/
			public final String toString()
			{
			assert debugEnter(CLASS_NAME, "toString");

			StringBuilder buffer = new StringBuilder();
			toString(buffer);
			@@ -40,7 +40,6 @@
			import org.opends.server.types.SearchFilter;
			import org.opends.server.types.SearchScope;

			import static org.opends.server.loggers.Debug.*;



			@@ -64,11 +63,6 @@
			*/
			public abstract class Group
			{
			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.api.Group";



			@@ -104,7 +98,6 @@
			*/
			public void finalizeGroupImplementation()
			{
			assert debugEnter(CLASS_NAME, "finalizeGroupImplementation");

			// No implementation is required by default.
			}
			@@ -294,7 +287,6 @@
			public MemberList getMembers()
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "getMembers");

			return getMembers(null, null, null);
			}
			@@ -395,7 +387,6 @@
			*/
			public String toString()
			{
			assert debugEnter(CLASS_NAME, "toString");

			StringBuilder buffer = new StringBuilder();
			toString(buffer);
New file
			@@ -0,0 +1,54 @@
			/*
			* CDDL HEADER START
			*
			* The contents of this file are subject to the terms of the
			* Common Development and Distribution License, Version 1.0 only
			* (the "License"). You may not use this file except in compliance
			* with the License.
			*
			* You can obtain a copy of the license at
			* trunk/opends/resource/legal-notices/OpenDS.LICENSE
			* or https://OpenDS.dev.java.net/OpenDS.LICENSE.
			* See the License for the specific language governing permissions
			* and limitations under the License.
			*
			* When distributing Covered Code, include this CDDL HEADER in each
			* file and include the License file at
			* trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
			* add the following below this CDDL HEADER, with the fields enclosed
			* by brackets "[]" replaced with your own identifying * information:
			* Portions Copyright [yyyy] [name of copyright owner]
			*
			* CDDL HEADER END
			*
			*
			* Portions Copyright 2006-2007 Sun Microsystems, Inc.
			*/
			package org.opends.server.api;

			import org.opends.server.loggers.LogRecord;
			import org.opends.server.loggers.LogErrorHandler;

			/**
			* LogPublishers are reponsible for distributing logged messages from
			* the Logger object to a destination.
			*/
			public interface LogPublisher
			{
			/**
			* Sends the log message to the logging destination. Every
			* LogPublisher must implement the publish method for
			* the generic LogRecord. Specialized LogPublishers should
			* also include an implementation to publish specialized
			* LogRecords (ie. DebugLogRecord).
			*
			* @param record the log record to publish.
			* @param handler the error handler to use when an error occurs.
			*/
			public void publish(LogRecord record, LogErrorHandler handler);

			/**
			* Releases any resources and prepare for close.
			*/
			public void shutdown();
			}
			@@ -33,7 +33,6 @@
			import org.opends.server.core.BindOperation;
			import org.opends.server.types.InitializationException;

			import static org.opends.server.loggers.Debug.*;



			@@ -44,11 +43,6 @@
			*/
			public abstract class SASLMechanismHandler
			{
			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.api.SASLMechanismHandler";



			@@ -83,7 +77,6 @@
			*/
			public void finalizeSASLMechanismHandler()
			{
			assert debugEnter(CLASS_NAME, "finalizeSASLMechanismHandler");

			// No implementation is required by default.
			}
			@@ -22,13 +22,10 @@
			* CDDL HEADER END
			*
			*
			* Portions Copyright 2006 Sun Microsystems, Inc.
			* Portions Copyright 2006-2007 Sun Microsystems, Inc.
			*/
			package org.opends.server.api;

			import static org.opends.server.loggers.Debug.debugConstructor;
			import static org.opends.server.loggers.Debug.debugEnter;

			import java.util.AbstractSet;
			import java.util.Collection;
			import java.util.HashSet;
			@@ -47,9 +44,6 @@
			*/
			public final class SubtreeSpecificationSet extends
			AbstractSet<SubtreeSpecification> {
			// Fully qualified class name for debugging purposes.
			private static final String CLASS_NAME =
			SubtreeSpecificationSet.class.getName();

			// Underlying implementation is simply a set.
			private HashSet<SubtreeSpecification> pimpl;
			@@ -58,7 +52,6 @@
			* Constructs a new empty subtree specification set.
			*/
			public SubtreeSpecificationSet() {
			assert debugConstructor(CLASS_NAME);

			this.pimpl = new HashSet<SubtreeSpecification>();
			}
			@@ -73,7 +66,6 @@
			*/
			public SubtreeSpecificationSet(
			Collection<? extends SubtreeSpecification> c) {
			assert debugConstructor(CLASS_NAME);

			this.pimpl = new HashSet<SubtreeSpecification>(c);
			}
			@@ -88,7 +80,6 @@
			* specified entry.
			*/
			public boolean isWithinScope(Entry entry) {
			assert debugEnter(CLASS_NAME, "contains");

			for (SubtreeSpecification subtreeSpecification : pimpl) {
			if (subtreeSpecification.isWithinScope(entry)) {
			@@ -104,7 +95,6 @@
			*/
			@Override
			public boolean add(SubtreeSpecification e) {
			assert debugEnter(CLASS_NAME, "add");

			return pimpl.add(e);
			}
			@@ -114,7 +104,6 @@
			*/
			@Override
			public Iterator<SubtreeSpecification> iterator() {
			assert debugEnter(CLASS_NAME, "iterator");

			return pimpl.iterator();
			}
			@@ -124,7 +113,6 @@
			*/
			@Override
			public boolean contains(Object o) {
			assert debugEnter(CLASS_NAME, "contains");

			return pimpl.contains(o);
			}
			@@ -134,7 +122,6 @@
			*/
			@Override
			public int size() {
			assert debugEnter(CLASS_NAME, "size");

			return pimpl.size();
			}
			@@ -22,13 +22,12 @@
			* CDDL HEADER END
			*
			*
			* Portions Copyright 2006 Sun Microsystems, Inc.
			* Portions Copyright 2006-2007 Sun Microsystems, Inc.
			*/
			package org.opends.server.api.plugin;



			import static org.opends.server.loggers.Debug.*;



			@@ -38,12 +37,6 @@
			*/
			public class IntermediateResponsePluginResult
			{
			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.api.plugin." +
			"IntermediateResponsePluginResult";



			@@ -114,11 +107,6 @@
			boolean sendIntermediateResponse,
			boolean continueOperation)
			{
			assert debugConstructor(CLASS_NAME,
			String.valueOf(connectionTerminated),
			String.valueOf(continuePluginProcessing),
			String.valueOf(sendIntermediateResponse),
			String.valueOf(continueOperation));

			this.connectionTerminated = connectionTerminated;
			this.continuePluginProcessing = continuePluginProcessing;
			@@ -138,7 +126,6 @@
			*/
			public boolean connectionTerminated()
			{
			assert debugEnter(CLASS_NAME, "connectionTerminated");

			return connectionTerminated;
			}
			@@ -155,7 +142,6 @@
			*/
			public boolean continuePluginProcessing()
			{
			assert debugEnter(CLASS_NAME, "continuePluginProcessing");

			return continuePluginProcessing;
			}
			@@ -172,7 +158,6 @@
			*/
			public boolean sendIntermediateResponse()
			{
			assert debugEnter(CLASS_NAME, "sendIntermediateResponse");

			return sendIntermediateResponse;
			}
			@@ -188,7 +173,6 @@
			*/
			public boolean continueOperation()
			{
			assert debugEnter(CLASS_NAME, "continueOperation");

			return continueOperation;
			}
			@@ -204,7 +188,6 @@
			*/
			public String toString()
			{
			assert debugEnter(CLASS_NAME, "toString");

			StringBuilder buffer = new StringBuilder();
			toString(buffer);
			@@ -222,8 +205,6 @@
			*/
			public void toString(StringBuilder buffer)
			{
			assert debugEnter(CLASS_NAME, "toString",
			"java.lang.StringBuilder");

			buffer.append("IntermediateResponsePluginResult(" +
			"connectionTerminated=");
			@@ -22,11 +22,10 @@
			* CDDL HEADER END
			*
			*
			* Portions Copyright 2006 Sun Microsystems, Inc.
			* Portions Copyright 2006-2007 Sun Microsystems, Inc.
			*/
			package org.opends.server.authorization;

			import static org.opends.server.loggers.Debug.debugEnter;

			import org.opends.server.api.AccessControlHandler;
			import org.opends.server.core.AddOperation;
			@@ -46,16 +45,12 @@
			* requests made by the core directory server.
			*/
			final class BasicAccessControlHandler extends AccessControlHandler {
			// Fully qualified class name for debugging purposes.
			private static final String CLASS_NAME =
			"org.opends.server.authorization.BasicAccessControlHandler";

			/**
			* {@inheritDoc}
			*/
			@Override
			public boolean isAllowed(AddOperation addOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			// TODO: not yet implemented.

			@@ -67,7 +62,6 @@
			*/
			@Override
			public boolean isAllowed(BindOperation bindOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			// TODO: not yet implemented.

			@@ -79,7 +73,6 @@
			*/
			@Override
			public boolean isAllowed(CompareOperation compareOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			// TODO: not yet implemented.

			@@ -91,7 +84,6 @@
			*/
			@Override
			public boolean isAllowed(DeleteOperation deleteOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			// TODO: not yet implemented.

			@@ -103,7 +95,6 @@
			*/
			@Override
			public boolean isAllowed(ExtendedOperation extendedOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			// TODO: not yet implemented.

			@@ -115,7 +106,6 @@
			*/
			@Override
			public boolean isAllowed(ModifyOperation modifyOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			// TODO: not yet implemented.

			@@ -127,7 +117,6 @@
			*/
			@Override
			public boolean isAllowed(ModifyDNOperation modifyDNOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			// TODO: not yet implemented.

			@@ -139,7 +128,6 @@
			*/
			@Override
			public boolean isAllowed(SearchOperation searchOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			// TODO: not yet implemented.

			@@ -152,7 +140,6 @@
			@Override
			public boolean maySend(SearchOperation searchOperation,
			SearchResultEntry searchEntry) {
			assert debugEnter(CLASS_NAME, "maySend");

			// TODO: not yet implemented.

			@@ -165,7 +152,6 @@
			@Override
			public SearchResultEntry filterEntry(SearchOperation searchOperation,
			SearchResultEntry searchEntry) {
			assert debugEnter(CLASS_NAME, "filterEntry");

			// TODO: not yet implemented.

			@@ -178,7 +164,6 @@
			@Override
			public boolean maySend(SearchOperation searchOperation,
			SearchResultReference searchReference) {
			assert debugEnter(CLASS_NAME, "maySend");

			// TODO: not yet implemented.
			@@ -26,8 +26,6 @@
			*/
			package org.opends.server.authorization.dseecompat;

			import static org.opends.server.loggers.Debug.debugConstructor;
			import static org.opends.server.loggers.Debug.debugEnter;

			/**
			* The AciException class defines an exception that may be thrown
			@@ -37,11 +35,6 @@
			*/
			public class AciException extends Exception {

			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.authorization.dseecompat.AciException";

			/**
			* The serial version identifier required to satisfy the compiler because this
			@@ -72,8 +65,6 @@
			*/
			public AciException(int messageID, String message) {
			super(message);
			assert debugConstructor(CLASS_NAME, String.valueOf(messageID),
			String.valueOf(message));
			this.messageID = messageID;
			}

			@@ -89,8 +80,6 @@
			public AciException(int messageID, String message, Throwable cause) {
			super(message, cause);

			assert debugConstructor(CLASS_NAME, String.valueOf(message),
			String.valueOf(cause));

			this.messageID = messageID;
			}
			@@ -101,7 +90,6 @@
			* @return The message ID for this exception.
			*/
			public int getMessageID() {
			assert debugEnter(CLASS_NAME, "getMessageID");
			return messageID;
			}
			}
			@@ -30,10 +30,20 @@
			import org.opends.server.api.AccessControlHandler;
			import static org.opends.server.authorization.dseecompat.AciMessages.*;
			import org.opends.server.core.*;
			import static org.opends.server.loggers.Debug.debugEnter;
			import static org.opends.server.loggers.Error.logError;
			import static org.opends.server.messages.MessageHandler.getMessage;
			import org.opends.server.types.*;
			import org.opends.server.types.Attribute;
			import org.opends.server.types.AttributeType;
			import org.opends.server.types.AttributeValue;
			import org.opends.server.types.DN;
			import org.opends.server.types.Entry;
			import org.opends.server.types.ErrorLogCategory;
			import org.opends.server.types.ErrorLogSeverity;
			import org.opends.server.types.Modification;
			import org.opends.server.types.ModificationType;
			import org.opends.server.types.Privilege;
			import org.opends.server.types.SearchResultEntry;
			import org.opends.server.types.SearchResultReference;
			import static org.opends.server.util.StaticUtils.toLowerCase;
			import java.util.LinkedList;
			import java.util.List;
			@@ -46,8 +56,6 @@
			public class AciHandler extends AccessControlHandler
			{

			private static final String CLASS_NAME =
			"org.opends.server.authorization.dseecompat.AciHandler";

			/**
			* ACI_ADD is used to set the container rights for a LDAP add operation.
			@@ -571,7 +579,6 @@
			* @return True if access is allowed.
			*/
			public boolean isAllowed(AddOperation operation) {
			assert debugEnter(CLASS_NAME, "isAllowed");
			AciLDAPOperationContainer operationContainer =
			new AciLDAPOperationContainer(operation, ACI_ADD);
			boolean ret=isAllowed(operationContainer,operation);
			@@ -593,7 +600,6 @@
			* @return True if access is allowed.
			*/
			public boolean isAllowed(CompareOperation operation) {
			assert debugEnter(CLASS_NAME, "isAllowed");

			AciLDAPOperationContainer operationContainer =
			new AciLDAPOperationContainer(operation, ACI_COMPARE);
			@@ -623,7 +629,6 @@
			* @return True if access is allowed.
			*/
			public boolean isAllowed(DeleteOperation operation) {
			assert debugEnter(CLASS_NAME, "isAllowed");
			AciLDAPOperationContainer operationContainer=
			new AciLDAPOperationContainer(operation, ACI_DELETE);
			return isAllowed(operationContainer, operation);
			@@ -637,7 +642,6 @@
			*/

			public boolean isAllowed(ModifyOperation operation) {
			assert debugEnter(CLASS_NAME, "isAllowed");
			AciLDAPOperationContainer operationContainer=
			new AciLDAPOperationContainer(operation, ACI_NULL);
			return aciCheckMods(operationContainer, operation,
			@@ -666,7 +670,6 @@
			*/
			public boolean
			maySend(SearchOperation operation, SearchResultEntry entry) {
			assert debugEnter(CLASS_NAME, "maySend");
			AciLDAPOperationContainer operationContainer =
			new AciLDAPOperationContainer(operation,
			(ACI_READ \| ACI_SEARCH), entry);
			@@ -693,7 +696,6 @@
			public SearchResultEntry filterEntry(SearchOperation operation,
			SearchResultEntry entry) {

			assert debugEnter(CLASS_NAME, "filterEntry");
			AciLDAPOperationContainer operationContainer =
			new AciLDAPOperationContainer(operation,
			(ACI_READ \| ACI_SEARCH), entry);
			@@ -713,7 +715,6 @@
			@Override
			public boolean maySend(SearchOperation operation,
			SearchResultReference reference) {
			assert debugEnter(CLASS_NAME, "maySend");
			//TODO: Planned to be implemented.
			return true;
			}
			@@ -723,7 +724,6 @@
			*/
			@Override
			public boolean isAllowed(ModifyDNOperation modifyDNOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");
			// TODO: Planned to be implemented.
			return true;
			}
			@@ -734,7 +734,6 @@
			*/
			@Override
			public boolean isAllowed(BindOperation bindOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");
			//Not planned to be implemented.
			return true;
			}
			@@ -744,7 +743,6 @@
			*/
			@Override
			public boolean isAllowed(ExtendedOperation extendedOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");
			//Not planned to be implemented.
			return true;
			}
			@@ -754,7 +752,6 @@
			*/
			@Override
			public boolean isAllowed(SearchOperation searchOperation) {
			assert debugEnter(CLASS_NAME, "isAllowed");
			//Not planned to be implemented.
			return true;
			}
			@@ -30,15 +30,25 @@
			import org.opends.server.api.ChangeNotificationListener;
			import org.opends.server.api.BackendInitializationListener;
			import org.opends.server.api.Backend;
			import org.opends.server.types.*;
			import org.opends.server.types.operation.PostResponseAddOperation;
			import org.opends.server.types.operation.PostResponseDeleteOperation;
			import org.opends.server.types.operation.PostResponseModifyOperation;
			import org.opends.server.types.operation.PostResponseModifyDNOperation;
			import org.opends.server.protocols.internal.InternalClientConnection;
			import org.opends.server.protocols.internal.InternalSearchOperation;
			import static org.opends.server.loggers.Debug.debugException;
			import static org.opends.server.loggers.debug.DebugLogger.debugCought;
			import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
			import static org.opends.server.loggers.Error.logError;
			import org.opends.server.types.DebugLogLevel;
			import org.opends.server.types.DN;
			import org.opends.server.types.DereferencePolicy;
			import org.opends.server.types.DirectoryException;
			import org.opends.server.types.Entry;
			import org.opends.server.types.ErrorLogCategory;
			import org.opends.server.types.ErrorLogSeverity;
			import org.opends.server.types.SearchFilter;
			import org.opends.server.types.SearchResultEntry;
			import org.opends.server.types.SearchScope;
			import static org.opends.server.authorization.dseecompat.AciMessages.*;
			import static org.opends.server.messages.MessageHandler.getMessage;

			@@ -52,11 +62,6 @@
			public class AciListenerManager
			implements ChangeNotificationListener, BackendInitializationListener {

			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.core.AciListenerManager";

			private AciList aciList;
			/*
			@@ -158,8 +163,10 @@
			continue;
			}
			} catch (Exception e) {
			assert debugException(CLASS_NAME,
			"performBackendInitializationProcessing", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			//TODO log message
			continue;
			}
			@@ -174,8 +181,10 @@
			{
			backend.search(internalSearch);
			} catch (Exception e) {
			assert debugException(CLASS_NAME,
			"performBackendInitializationProcessing", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			//TODO log message
			continue;
			}
			@@ -32,15 +32,12 @@
			import org.opends.server.config.ConfigEntry;
			import org.opends.server.config.ConfigException;
			import org.opends.server.types.InitializationException;
			import static org.opends.server.loggers.Debug.debugConstructor;

			/**
			* This class is the provider class for the dseecompt ACI.
			*/
			public class AciProvider implements AccessControlProvider {

			private static final String CLASS_NAME =
			"org.opends.server.authorization.dseecompat.AciProvider";

			private static AciHandler instance = null;

			@@ -49,7 +46,6 @@
			*/
			public AciProvider() {
			super();
			assert debugConstructor(CLASS_NAME);
			}
			@@ -75,7 +75,9 @@
			import org.opends.server.types.SearchScope;

			import static org.opends.server.config.ConfigConstants.*;
			import static org.opends.server.loggers.Debug.*;
			import static org.opends.server.loggers.debug.DebugLogger.debugCought;
			import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
			import org.opends.server.types.DebugLogLevel;
			import static org.opends.server.messages.BackendMessages.*;
			import static org.opends.server.messages.MessageHandler.*;
			import static org.opends.server.util.ServerConstants.*;
			@@ -95,11 +97,6 @@
			extends Backend
			implements ConfigurableComponent
			{
			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.backends.BackupBackend";



			@@ -135,7 +132,6 @@
			{
			super();

			assert debugConstructor(CLASS_NAME);


			// Perform all initialization in initializeBackend.
			@@ -162,8 +158,6 @@
			public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
			throws ConfigException, InitializationException
			{
			assert debugEnter(CLASS_NAME, "initializeBackend",
			String.valueOf(configEntry));


			// Make sure that a configuration entry was provided. If not, then we will
			@@ -186,7 +180,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "initializeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_BACKUP_CANNOT_DECODE_BACKUP_ROOT_DN;
			String message = getMessage(msgID, stackTraceToSingleLineString(e));
			@@ -223,11 +220,14 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "initializeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			msgID = MSGID_BACKUP_CANNOT_DETERMINE_BACKUP_DIR_LIST;
			String message = getMessage(msgID, stackTraceToSingleLineString(e));
			throw new InitializationException(msgID, message,e);
			throw new InitializationException(msgID, message, e);
			}


			@@ -281,7 +281,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "initializeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
			String message = getMessage(msgID, backupBaseDN.toString(),
			@@ -305,7 +308,6 @@
			*/
			public void finalizeBackend()
			{
			assert debugEnter(CLASS_NAME, "finalizeBackend");

			DirectoryServer.deregisterConfigurableComponent(this);

			@@ -315,7 +317,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "finalizeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}

			@@ -328,7 +333,6 @@
			*/
			public DN[] getBaseDNs()
			{
			assert debugEnter(CLASS_NAME, "getBaseDNs");

			return baseDNs;
			}
			@@ -340,7 +344,6 @@
			*/
			public long getEntryCount()
			{
			assert debugEnter(CLASS_NAME, "getEntryCount");

			int numEntries = 1;

			@@ -382,7 +385,6 @@
			*/
			public boolean isLocal()
			{
			assert debugEnter(CLASS_NAME, "isLocal");

			// For the purposes of this method, this is a local backend.
			return true;
			@@ -404,7 +406,6 @@
			public Entry getEntry(DN entryDN)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "getEntry", String.valueOf(entryDN));


			// If the requested entry was null, then throw an exception.
			@@ -470,8 +471,6 @@
			private Entry getBackupDirectoryEntry(DN entryDN)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "getBackupDirectoryEntry",
			String.valueOf(entryDN));


			// Make sure that the DN specifies a backup directory.
			@@ -497,9 +496,12 @@
			}
			catch (ConfigException ce)
			{
			assert debugException(CLASS_NAME, "getBackupDirectoryEntry", ce);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, ce);
			}

			int msgID = MSGID_BACKUP_INVALID_BACKUP_DIRECTORY;
			int msgID = MSGID_BACKUP_INVALID_BACKUP_DIRECTORY;
			String message = getMessage(msgID, String.valueOf(entryDN),
			ce.getMessage());
			throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
			@@ -507,9 +509,12 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "getBackupDirectoryEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY;
			int msgID = MSGID_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY;
			String message = getMessage(msgID, stackTraceToSingleLineString(e));
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			message, msgID);
			@@ -568,7 +573,6 @@
			private Entry getBackupEntry(DN entryDN)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "getBackupEntry", String.valueOf(entryDN));


			// First, get the backup ID from the entry DN.
			@@ -615,18 +619,24 @@
			}
			catch (ConfigException ce)
			{
			assert debugException(CLASS_NAME, "getBackupEntry", ce);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, ce);
			}

			int msgID = MSGID_BACKUP_INVALID_BACKUP_DIRECTORY;
			int msgID = MSGID_BACKUP_INVALID_BACKUP_DIRECTORY;
			String message = getMessage(msgID, ce.getMessage());
			throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
			msgID);
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "getBackupEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY;
			int msgID = MSGID_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY;
			String message = getMessage(msgID, stackTraceToSingleLineString(e));
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			message, msgID);
			@@ -787,8 +797,6 @@
			public void addEntry(Entry entry, AddOperation addOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "addEntry", String.valueOf(entry),
			String.valueOf(addOperation));

			int msgID = MSGID_BACKUP_ADD_NOT_SUPPORTED;
			String message = getMessage(msgID);
			@@ -815,8 +823,6 @@
			public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "deleteEntry", String.valueOf(entryDN),
			String.valueOf(deleteOperation));

			int msgID = MSGID_BACKUP_DELETE_NOT_SUPPORTED;
			String message = getMessage(msgID);
			@@ -843,8 +849,6 @@
			public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "replaceEntry", String.valueOf(entry),
			String.valueOf(modifyOperation));

			int msgID = MSGID_BACKUP_MODIFY_NOT_SUPPORTED;
			String message = getMessage(msgID);
			@@ -873,8 +877,6 @@
			ModifyDNOperation modifyDNOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "renameEntry", String.valueOf(currentDN),
			String.valueOf(entry), String.valueOf(modifyDNOperation));

			int msgID = MSGID_BACKUP_MODIFY_DN_NOT_SUPPORTED;
			String message = getMessage(msgID);
			@@ -897,7 +899,6 @@
			public void search(SearchOperation searchOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "search", String.valueOf(searchOperation));


			// Get the base entry for the search, if possible. If it doesn't exist,
			@@ -947,7 +948,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "search", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			continue;
			}
			@@ -986,7 +990,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "search", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			continue;
			}
			@@ -1040,7 +1047,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "search", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			continue;
			}
			@@ -1087,7 +1097,6 @@
			*/
			public HashSet<String> getSupportedControls()
			{
			assert debugEnter(CLASS_NAME, "getSupportedControls");

			return supportedControls;
			}
			@@ -1101,7 +1110,6 @@
			*/
			public HashSet<String> getSupportedFeatures()
			{
			assert debugEnter(CLASS_NAME, "getSupportedFeatures");

			return supportedFeatures;
			}
			@@ -1117,7 +1125,6 @@
			*/
			public boolean supportsLDIFExport()
			{
			assert debugEnter(CLASS_NAME, "supportsLDIFExport");

			// We do not support LDIF exports.
			return false;
			@@ -1142,7 +1149,6 @@
			LDIFExportConfig exportConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "exportLDIF", String.valueOf(exportConfig));

			int msgID = MSGID_BACKUP_EXPORT_NOT_SUPPORTED;
			String message = getMessage(msgID);
			@@ -1161,7 +1167,6 @@
			*/
			public boolean supportsLDIFImport()
			{
			assert debugEnter(CLASS_NAME, "supportsLDIFImport");

			// This backend does not support LDIF imports.
			return false;
			@@ -1186,7 +1191,6 @@
			LDIFImportConfig importConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "importLDIF", String.valueOf(importConfig));


			// This backend does not support LDIF imports.
			@@ -1211,7 +1215,6 @@
			*/
			public boolean supportsBackup()
			{
			assert debugEnter(CLASS_NAME, "supportsBackup");

			// This backend does not provide a backup/restore mechanism.
			return false;
			@@ -1237,7 +1240,6 @@
			public boolean supportsBackup(BackupConfig backupConfig,
			StringBuilder unsupportedReason)
			{
			assert debugEnter(CLASS_NAME, "supportsBackup");


			// This backend does not provide a backup/restore mechanism.
			@@ -1262,7 +1264,6 @@
			public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "createBackup", String.valueOf(backupConfig));


			// This backend does not provide a backup/restore mechanism.
			@@ -1290,9 +1291,6 @@
			String backupID)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "removeBackup",
			String.valueOf(backupDirectory),
			String.valueOf(backupID));


			// This backend does not provide a backup/restore mechanism.
			@@ -1312,7 +1310,6 @@
			*/
			public boolean supportsRestore()
			{
			assert debugEnter(CLASS_NAME, "supportsRestore");


			// This backend does not provide a backup/restore mechanism.
			@@ -1338,8 +1335,6 @@
			RestoreConfig restoreConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "restoreBackup",
			String.valueOf(restoreConfig));


			// This backend does not provide a backup/restore mechanism.
			@@ -1360,7 +1355,6 @@
			*/
			public DN getConfigurableComponentEntryDN()
			{
			assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");

			return configEntryDN;
			}
			@@ -1376,7 +1370,6 @@
			*/
			public List<ConfigAttribute> getConfigurationAttributes()
			{
			assert debugEnter(CLASS_NAME, "getConfigurationAttributes");


			LinkedList<ConfigAttribute> attrs = new LinkedList<ConfigAttribute>();
			@@ -1415,8 +1408,6 @@
			public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
			List<String> unacceptableReasons)
			{
			assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration",
			String.valueOf(configEntry), "java.util.List<String>");


			// We'll accept anything here. The only configurable attribute is the
			@@ -1446,9 +1437,6 @@
			public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
			boolean detailedResults)
			{
			assert debugEnter(CLASS_NAME, "applyNewConfiguration",
			String.valueOf(configEntry),
			String.valueOf(detailedResults));


			ResultCode resultCode = ResultCode.SUCCESS;
			@@ -1481,7 +1469,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "initializeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			msgID = MSGID_BACKUP_CANNOT_DETERMINE_BACKUP_DIR_LIST;
			messages.add(getMessage(msgID, stackTraceToSingleLineString(e)));
			@@ -69,7 +69,9 @@
			import static org.opends.server.loggers.Error.logError;
			import static org.opends.server.messages.ConfigMessages.*;
			import static org.opends.server.config.ConfigConstants.ATTR_BACKEND_BASE_DN;
			import static org.opends.server.loggers.Debug.*;
			import static org.opends.server.loggers.debug.DebugLogger.debugCought;
			import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
			import org.opends.server.types.DebugLogLevel;
			import static org.opends.server.util.ServerConstants.OID_SUBTREE_DELETE_CONTROL;
			import static org.opends.server.util.ServerConstants.OID_PAGED_RESULTS_CONTROL;
			import static org.opends.server.util.ServerConstants.OID_MANAGE_DSAIT_CONTROL;
			@@ -80,11 +82,6 @@
			*/
			public class BackendImpl extends Backend implements ConfigurableComponent
			{
			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.backends.jeb.BackendImpl";

			/**
			* The DN of the configuration entry for this backend.
			@@ -168,7 +165,6 @@
			*/
			private void readerBegin()
			{
			assert debugEnter(CLASS_NAME, "readerBegin");

			threadTotalCount.getAndIncrement();
			}
			@@ -180,7 +176,6 @@
			*/
			private void readerEnd()
			{
			assert debugEnter(CLASS_NAME, "readerEnd");

			threadTotalCount.getAndDecrement();
			}
			@@ -192,7 +187,6 @@
			*/
			private void writerBegin()
			{
			assert debugEnter(CLASS_NAME, "writerBegin");

			threadTotalCount.getAndIncrement();
			threadWriteCount.getAndIncrement();
			@@ -205,7 +199,6 @@
			*/
			private void writerEnd()
			{
			assert debugEnter(CLASS_NAME, "writerEnd");

			threadWriteCount.getAndDecrement();
			threadTotalCount.getAndDecrement();
			@@ -220,7 +213,6 @@
			*/
			private void waitUntilQuiescent()
			{
			assert debugEnter(CLASS_NAME, "waitUntilQuiescent");

			while (threadTotalCount.get() > 0)
			{
			@@ -231,7 +223,10 @@
			}
			catch (InterruptedException e)
			{
			assert debugException(CLASS_NAME, "waitUntilQuiescent", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}
			}
			@@ -246,7 +241,6 @@
			*/
			public static String getContainerName(DN dn)
			{
			assert debugEnter(CLASS_NAME, "getContainerName");

			String normStr = dn.toNormalizedString();
			StringBuilder builder = new StringBuilder(normStr.length());
			@@ -286,7 +280,6 @@
			public void initializeBackend(ConfigEntry configEntry, DN[] baseDNs)
			throws ConfigException, InitializationException
			{
			assert debugEnter(CLASS_NAME, "initializeBackend");

			configDN = configEntry.getDN();

			@@ -302,9 +295,12 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "initializeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
			int msgID = MSGID_BACKEND_CANNOT_REGISTER_BASEDN;
			String message = getMessage(msgID, String.valueOf(dn),
			String.valueOf(e));
			throw new InitializationException(msgID, message, e);
			@@ -327,7 +323,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "initializeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			String message = getMessage(MSGID_JEB_OPEN_ENV_FAIL,
			e.getMessage());
			throw new InitializationException(MSGID_JEB_OPEN_ENV_FAIL, message, e);
			@@ -345,8 +344,10 @@
			}
			catch (DatabaseException databaseException)
			{
			assert debugException(CLASS_NAME, "initializeBackend",
			databaseException);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, databaseException);
			}
			String message = getMessage(MSGID_JEB_OPEN_DATABASE_FAIL,
			databaseException.getMessage());
			throw new InitializationException(MSGID_JEB_OPEN_DATABASE_FAIL, message,
			@@ -366,8 +367,10 @@
			}
			catch(DatabaseException databaseException)
			{
			assert debugException(CLASS_NAME, "initializeBackend",
			databaseException);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, databaseException);
			}
			String message = getMessage(MSGID_JEB_GET_ENTRY_COUNT_FAILED,
			databaseException.getMessage());
			throw new InitializationException(MSGID_JEB_GET_ENTRY_COUNT_FAILED,
			@@ -397,7 +400,6 @@
			*/
			public void finalizeBackend()
			{
			assert debugEnter(CLASS_NAME, "finalizeBackend");

			// Deregister our configurable components.
			// TODO: configurableEnv is always null and will not be deregistered.
			@@ -418,7 +420,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "finalizeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}

			@@ -442,7 +447,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "finalizeBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			int msgID = MSGID_JEB_DATABASE_EXCEPTION;
			String message = getMessage(msgID, e.getMessage());
			logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.SEVERE_ERROR,
			@@ -470,7 +478,6 @@
			*/
			public boolean isLocal()
			{
			assert debugEnter(CLASS_NAME, "isLocal");

			return true;
			}
			@@ -486,7 +493,6 @@
			*/
			public boolean supportsLDIFExport()
			{
			assert debugEnter(CLASS_NAME, "supportsLDIFExport");

			return true;
			}
			@@ -502,7 +508,6 @@
			*/
			public boolean supportsLDIFImport()
			{
			assert debugEnter(CLASS_NAME, "supportsLDIFImport");

			return true;
			}
			@@ -522,7 +527,6 @@
			*/
			public boolean supportsBackup()
			{
			assert debugEnter(CLASS_NAME, "supportsBackup");

			return true;
			}
			@@ -546,7 +550,6 @@
			public boolean supportsBackup(BackupConfig backupConfig,
			StringBuilder unsupportedReason)
			{
			assert debugEnter(CLASS_NAME, "supportsBackup");

			return true;
			}
			@@ -561,7 +564,6 @@
			*/
			public boolean supportsRestore()
			{
			assert debugEnter(CLASS_NAME, "supportsRestore");

			return true;
			}
			@@ -575,7 +577,6 @@
			*/
			public HashSet<String> getSupportedFeatures()
			{
			assert debugEnter(CLASS_NAME, "getSupportedFeatures");

			return new HashSet<String>(); //NYI
			}
			@@ -589,7 +590,6 @@
			*/
			public HashSet<String> getSupportedControls()
			{
			assert debugEnter(CLASS_NAME, "getSupportedControls");

			return supportedControls;
			}
			@@ -603,7 +603,6 @@
			*/
			public DN[] getBaseDNs()
			{
			assert debugEnter(CLASS_NAME, "getBaseDNs");

			return config.getBaseDNs();
			}
			@@ -615,7 +614,6 @@
			*/
			public long getEntryCount()
			{
			assert debugEnter(CLASS_NAME, "getEntryCount");

			if (rootContainer != null)
			{
			@@ -625,7 +623,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "getEntryCount", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}

			@@ -646,7 +647,6 @@
			*/
			public Entry getEntry(DN entryDN) throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "getEntry");

			readerBegin();
			try
			@@ -659,7 +659,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "getEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
			e.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -667,7 +670,10 @@
			}
			catch (JebException e)
			{
			assert debugException(CLASS_NAME, "getEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -698,7 +704,6 @@
			public void addEntry(Entry entry, AddOperation addOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "addEntry");

			writerBegin();
			try
			@@ -712,7 +717,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "addEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
			e.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -720,7 +728,10 @@
			}
			catch (JebException e)
			{
			assert debugException(CLASS_NAME, "addEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -750,7 +761,6 @@
			public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "deleteEntry");

			writerBegin();
			try
			@@ -762,7 +772,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "deleteEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
			e.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -770,7 +783,10 @@
			}
			catch (JebException e)
			{
			assert debugException(CLASS_NAME, "deleteEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -800,7 +816,6 @@
			public void replaceEntry(Entry entry, ModifyOperation modifyOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "replaceEntry");

			writerBegin();
			try
			@@ -814,7 +829,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "replaceEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
			e.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -822,7 +840,10 @@
			}
			catch (JebException e)
			{
			assert debugException(CLASS_NAME, "replaceEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -858,7 +879,6 @@
			ModifyDNOperation modifyDNOperation)
			throws DirectoryException, CancelledOperationException
			{
			assert debugEnter(CLASS_NAME, "renameEntry");

			writerBegin();
			try
			@@ -881,14 +901,20 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "renameEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION, e.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			message, MSGID_JEB_DATABASE_EXCEPTION);
			}
			catch (JebException e)
			{
			assert debugException(CLASS_NAME, "renameEntry", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -913,7 +939,6 @@
			public void search(SearchOperation searchOperation)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "search");

			readerBegin();
			try
			@@ -924,7 +949,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "search", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION, e.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			message, MSGID_JEB_DATABASE_EXCEPTION);
			@@ -953,7 +981,6 @@
			LDIFExportConfig exportConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "exportLDIF");

			// Initialize a config object.
			config = new Config();
			@@ -964,7 +991,10 @@
			}
			catch (ConfigException e)
			{
			assert debugException(CLASS_NAME, "exportLDIF", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -991,7 +1021,10 @@
			}
			catch (IOException ioe)
			{
			assert debugException(CLASS_NAME, "exportLDIF", ioe);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, ioe);
			}
			int msgID = MSGID_JEB_IO_ERROR;
			String message = getMessage(msgID, ioe.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -999,14 +1032,20 @@
			}
			catch (JebException je)
			{
			assert debugException(CLASS_NAME, "exportLDIF", je);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, je);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			je.getMessage(),
			je.getMessageID());
			}
			catch (DatabaseException de)
			{
			assert debugException(CLASS_NAME, "exportLDIF", de);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, de);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
			de.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -1014,7 +1053,10 @@
			}
			catch (LDIFException e)
			{
			assert debugException(CLASS_NAME, "exportLDIF", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -1032,7 +1074,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "exportLDIF", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}
			}
			@@ -1056,7 +1101,6 @@
			LDIFImportConfig importConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "importLDIF");

			// Initialize a config object.
			config = new Config();
			@@ -1067,7 +1111,10 @@
			}
			catch (ConfigException e)
			{
			assert debugException(CLASS_NAME, "importLDIF", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -1080,7 +1127,10 @@
			}
			catch (IOException ioe)
			{
			assert debugException(CLASS_NAME, "importLDIF", ioe);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, ioe);
			}
			int msgID = MSGID_JEB_IO_ERROR;
			String message = getMessage(msgID, ioe.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -1088,14 +1138,20 @@
			}
			catch (JebException je)
			{
			assert debugException(CLASS_NAME, "importLDIF", je);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, je);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			je.getMessage(),
			je.getMessageID());
			}
			catch (DatabaseException de)
			{
			assert debugException(CLASS_NAME, "importLDIF", de);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, de);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
			de.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -1123,7 +1179,6 @@
			DN[] baseDNs, Entry statEntry)
			throws InitializationException, ConfigException, DirectoryException
			{
			assert debugEnter(CLASS_NAME, "verifyBackend");

			// Initialize a config object.
			config = new Config();
			@@ -1150,7 +1205,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "verifyBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			String message = getMessage(MSGID_JEB_DATABASE_EXCEPTION,
			e.getMessage());
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -1158,7 +1216,10 @@
			}
			catch (JebException e)
			{
			assert debugException(CLASS_NAME, "verifyBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -1176,7 +1237,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "verifyBackend", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}
			}
			@@ -1199,7 +1263,6 @@
			public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "createBackup");

			BackupManager backupManager =
			new BackupManager(getBackendID());
			@@ -1222,7 +1285,6 @@
			public void removeBackup(BackupDirectory backupDirectory, String backupID)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "removeBackup");

			BackupManager backupManager =
			new BackupManager(getBackendID());
			@@ -1246,7 +1308,6 @@
			RestoreConfig restoreConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "restoreBackup");

			BackupManager backupManager =
			new BackupManager(getBackendID());
			@@ -1264,7 +1325,6 @@
			*/
			public DN getConfigurableComponentEntryDN()
			{
			assert debugEnter(CLASS_NAME, "getConfigurableComponentEntryDN");

			return configDN;
			}
			@@ -1280,7 +1340,6 @@
			*/
			public List<ConfigAttribute> getConfigurationAttributes()
			{
			assert debugEnter(CLASS_NAME, "getConfigurationAttributes");

			return configAttrs;
			}
			@@ -1303,7 +1362,6 @@
			public boolean hasAcceptableConfiguration(ConfigEntry configEntry,
			List<String> unacceptableReasons)
			{
			assert debugEnter(CLASS_NAME, "hasAcceptableConfiguration");

			DN[] baseDNs = null;
			boolean acceptable = true;
			@@ -1364,7 +1422,6 @@
			public ConfigChangeResult applyNewConfiguration(ConfigEntry configEntry,
			boolean detailedResults)
			{
			assert debugEnter(CLASS_NAME, "applyNewConfiguration");

			ConfigChangeResult ccr;
			ResultCode resultCode = ResultCode.SUCCESS;
			@@ -1418,7 +1475,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "applyNewConfiguration", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			resultCode = DirectoryServer.getServerErrorResultCode();

			@@ -1457,7 +1517,6 @@
			*/
			public RootContainer getRootContainer()
			{
			assert debugEnter(CLASS_NAME, "getRootContainer");
			return rootContainer;
			}
			@@ -69,8 +69,9 @@
			import java.util.zip.ZipInputStream;
			import java.util.zip.ZipOutputStream;

			import static org.opends.server.loggers.Debug.debugEnter;
			import static org.opends.server.loggers.Debug.debugException;
			import static org.opends.server.loggers.debug.DebugLogger.debugCought;
			import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
			import org.opends.server.types.DebugLogLevel;
			import static org.opends.server.loggers.Error.logError;
			import static org.opends.server.messages.MessageHandler.getMessage;
			import static org.opends.server.messages.JebMessages.*;
			@@ -113,11 +114,6 @@
			*/
			public static final String ZIPENTRY_EMPTY_PLACEHOLDER = "empty.placeholder";

			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.backends.jeb.BackupManager";

			/**
			* The backend ID.
			@@ -150,7 +146,6 @@
			public void createBackup(ConfigEntry configEntry, BackupConfig backupConfig)
			throws DirectoryException
			{
			assert debugEnter(CLASS_NAME, "createBackup", String.valueOf(backupConfig));


			// Parse our backend configuration.
			@@ -161,7 +156,10 @@
			}
			catch (ConfigException e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -204,7 +202,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_GET_MAC;
			String message = getMessage(msgID, macAlgorithm,
			@@ -224,7 +225,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_GET_DIGEST;
			String message = getMessage(msgID, digestAlgorithm,
			@@ -347,7 +351,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_CREATE_ARCHIVE_FILE;
			String message = getMessage(msgID, String.valueOf(archiveFilename),
			@@ -372,7 +379,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_GET_CIPHER;
			String message = getMessage(msgID, cipherAlgorithm,
			@@ -436,7 +446,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			msgID = MSGID_JEB_BACKUP_CANNOT_LIST_LOG_FILES;
			message = getMessage(msgID, backendDir.getAbsolutePath(),
			@@ -456,7 +469,10 @@
			}
			catch (IOException e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			msgID = MSGID_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE;
			message = getMessage(msgID, ZIPENTRY_EMPTY_PLACEHOLDER,
			stackTraceToSingleLineString(e));
			@@ -535,7 +551,10 @@
			}
			catch (IOException e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			msgID = MSGID_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE;
			message = getMessage(msgID, zipEntryName,
			stackTraceToSingleLineString(e));
			@@ -564,14 +583,20 @@
			}
			catch (FileNotFoundException e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			// A log file has been deleted by the cleaner since we started.
			deletedFiles = true;
			}
			catch (IOException e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			msgID = MSGID_JEB_BACKUP_CANNOT_WRITE_ARCHIVE_FILE;
			message = getMessage(msgID, logFile.getName(),
			stackTraceToSingleLineString(e));
			@@ -608,7 +633,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			msgID = MSGID_JEB_BACKUP_CANNOT_LIST_LOG_FILES;
			message = getMessage(msgID, backendDir.getAbsolutePath(),
			@@ -640,7 +668,10 @@
			}
			catch (DirectoryException e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			try
			{
			@@ -656,7 +687,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			msgID = MSGID_JEB_BACKUP_CANNOT_CLOSE_ZIP_STREAM;
			message = getMessage(msgID, archiveFilename, backupDir.getPath(),
			@@ -698,13 +732,17 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			msgID = MSGID_JEB_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR;
			message = getMessage(msgID, backupDir.getDescriptorPath(),
			stackTraceToSingleLineString(e));
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			message, msgID, e); }
			message, msgID, e);
			}
			}


			@@ -735,7 +773,10 @@
			}
			catch (ConfigException e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -766,8 +807,11 @@
			}
			catch (IOException e)
			{
			assert debugException(CLASS_NAME, "restoreBackup", e);
			int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
			String message = getMessage(msgID, backupInfo.getBackupID(),
			stackTraceToSingleLineString(e));
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -784,8 +828,11 @@
			}
			catch (IOException e)
			{
			assert debugException(CLASS_NAME, "restoreBackup", e);
			int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
			String message = getMessage(msgID, dependent.getBackupID(),
			stackTraceToSingleLineString(e));
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -800,8 +847,11 @@
			}
			catch (IOException e)
			{
			assert debugException(CLASS_NAME, "restoreBackup", e);
			int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			int msgID = MSGID_JEB_BACKUP_CANNOT_RESTORE;
			String message = getMessage(msgID, backupInfo.getBackupID(),
			stackTraceToSingleLineString(e));
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			@@ -860,7 +910,10 @@
			}
			catch (ConfigException e)
			{
			assert debugException(CLASS_NAME, "removeBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
			e.getMessage(),
			e.getMessageID());
			@@ -872,7 +925,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "createBackup", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR;
			String message = getMessage(msgID, backupDir.getDescriptorPath(),
			@@ -909,8 +965,6 @@
			Set<String> includeFiles)
			throws DirectoryException,IOException
			{
			assert debugEnter(CLASS_NAME, "restoreArchive",
			String.valueOf(restoreConfig));


			BackupDirectory backupDir = restoreConfig.getBackupDirectory();
			@@ -947,7 +1001,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "restoreArchive", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_GET_MAC;
			String message = getMessage(msgID, macAlgorithm,
			@@ -967,7 +1024,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "restoreArchive", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_GET_DIGEST;
			String message = getMessage(msgID, digestAlgorithm,
			@@ -992,7 +1052,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "restoreArchive", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_GET_CIPHER;
			String message = getMessage(msgID, cipherAlgorithm,
			@@ -1333,7 +1396,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "restoreArchive", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}

			int msgID = MSGID_JEB_BACKUP_CANNOT_GET_CIPHER;
			String message = getMessage(msgID, cipherAlgorithm,
			@@ -22,13 +22,15 @@
			* CDDL HEADER END
			*
			*
			* Portions Copyright 2006 Sun Microsystems, Inc.
			* Portions Copyright 2006-2007 Sun Microsystems, Inc.
			*/
			package org.opends.server.backends.jeb;

			import com.sleepycat.je.Database;
			import com.sleepycat.je.DatabaseException;
			import static org.opends.server.loggers.Debug.debugException;
			import static org.opends.server.loggers.debug.DebugLogger.debugCought;
			import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
			import org.opends.server.types.DebugLogLevel;

			import java.util.Comparator;

			@@ -38,11 +40,6 @@
			*/
			public class DbPreloadComparator implements Comparator<Database>
			{
			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.backends.jeb.EntryContainer";

			/**
			* Calculate the relative priority of a database for preloading.
			@@ -70,7 +67,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "TODO", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			return 3;
			}
			}
			@@ -38,7 +38,6 @@
			import org.opends.server.core.ModifyDNOperation;
			import org.opends.server.core.Operation;
			import org.opends.server.core.SearchOperation;
			import org.opends.server.loggers.Debug;
			import org.opends.server.protocols.asn1.ASN1OctetString;
			import org.opends.server.protocols.ldap.LDAPException;
			import org.opends.server.controls.PagedResultsControl;
			@@ -47,7 +46,7 @@
			import org.opends.server.types.AttributeValue;
			import org.opends.server.types.CancelledOperationException;
			import org.opends.server.types.Control;
			import org.opends.server.types.DebugLogCategory;
			import org.opends.server.types.DebugLogLevel;
			import org.opends.server.types.DirectoryException;
			import org.opends.server.types.DN;
			import org.opends.server.types.Entry;
			@@ -69,11 +68,10 @@

			import static org.opends.server.messages.MessageHandler.getMessage;
			import static org.opends.server.messages.JebMessages.*;
			import static org.opends.server.loggers.Debug.debugException;
			import static org.opends.server.types.DebugLogSeverity.VERBOSE;
			import static org.opends.server.types.DebugLogCategory.DATABASE_ACCESS;
			import static org.opends.server.types.DebugLogCategory.DATABASE_WRITE;
			import static org.opends.server.types.DebugLogCategory.DATABASE_READ;
			import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
			import static org.opends.server.loggers.debug.DebugLogger.debugCought;
			import static org.opends.server.loggers.debug.DebugLogger.debugJEAccess;
			import static org.opends.server.loggers.debug.DebugLogger.debugVerbose;
			import static org.opends.server.util.ServerConstants.OID_SUBTREE_DELETE_CONTROL;
			import static org.opends.server.util.ServerConstants.OID_PAGED_RESULTS_CONTROL;

			@@ -84,11 +82,6 @@
			*/
			public class EntryContainer
			{
			/**
			* The fully-qualified name of this class for debugging purposes.
			*/
			private static final String CLASS_NAME =
			"org.opends.server.backends.jeb.EntryContainer";

			/**
			* The name of the entry database.
			@@ -286,7 +279,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "open", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			close();
			throw e;
			}
			@@ -344,7 +340,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "open", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			close();
			throw e;
			}
			@@ -399,7 +398,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "openReadOnly", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			close();
			throw e;
			}
			@@ -562,7 +564,10 @@
			}
			catch (LDAPException e)
			{
			assert debugException(CLASS_NAME, "search", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
			e.getMessage(), e.getMessageID(), e);
			}
			@@ -595,7 +600,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "search", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}

			// The base entry must exist for a successful result.
			@@ -769,7 +777,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "search", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}

			// The base entry must exist for a successful result.
			@@ -849,7 +860,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "searchNotIndexed", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			int msgID = MSGID_JEB_INVALID_PAGED_RESULTS_COOKIE;
			String str = StaticUtils.bytesToHex(pageRequest.getCookie().value());
			String msg = getMessage(msgID, str);
			@@ -987,11 +1001,17 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "searchNotIndexed", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			catch (JebException e)
			{
			assert debugException(CLASS_NAME, "searchNotIndexed", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}

			if (pageRequest != null)
			@@ -1050,7 +1070,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "searchIndexed", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			int msgID = MSGID_JEB_INVALID_PAGED_RESULTS_COOKIE;
			String str = StaticUtils.bytesToHex(pageRequest.getCookie().value());
			String msg = getMessage(msgID, str);
			@@ -1115,7 +1138,10 @@
			}
			catch (Exception e)
			{
			assert debugException(CLASS_NAME, "searchIndexed", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			continue;
			}
			}
			@@ -1308,8 +1334,10 @@
			{
			throw deadlockException;
			}
			assert debugException(CLASS_NAME, "invokeTransactedOperation",
			deadlockException);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, deadlockException);
			}
			}
			catch (DatabaseException databaseException)
			{
			@@ -2072,7 +2100,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "entryExists", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}

			return id != null;
			@@ -3266,7 +3297,10 @@
			}
			catch (DatabaseNotFoundException e)
			{
			assert debugException(CLASS_NAME, "removeContainer", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			try
			{
			@@ -3274,7 +3308,10 @@
			}
			catch (DatabaseNotFoundException e)
			{
			assert debugException(CLASS_NAME, "removeContainer", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			try
			{
			@@ -3282,7 +3319,10 @@
			}
			catch (DatabaseNotFoundException e)
			{
			assert debugException(CLASS_NAME, "removeContainer", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			try
			{
			@@ -3290,7 +3330,10 @@
			}
			catch (DatabaseNotFoundException e)
			{
			assert debugException(CLASS_NAME, "removeContainer", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			for (AttributeIndex index : attrIndexMap.values())
			{
			@@ -3300,7 +3343,10 @@
			}
			catch (DatabaseNotFoundException e)
			{
			assert debugException(CLASS_NAME, "removeContainer", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}
			}
			@@ -3346,7 +3392,10 @@
			}
			catch (DatabaseException e)
			{
			assert debugException(CLASS_NAME, "listDatabases", e);
			if (debugEnabled())
			{
			debugCought(DebugLogLevel.ERROR, e);
			}
			}
			}
			}
			@@ -3426,10 +3475,11 @@
			try
			{
			database = env.openDatabase(txn, fullName, dbConfig);
			assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
			"openDatabase",
			"open db=" + database.getDatabaseName() +
			" txnid=" + txn.getId());
			if (debugEnabled())
			{
			debugVerbose("open db=%s txnid=%d", database.getDatabaseName(),
			txn.getId());
			}
			transactionCommit(txn);
			}
			catch (DatabaseException e)
			@@ -3441,10 +3491,10 @@
			else
			{
			database = env.openDatabase(null, fullName, dbConfig);
			assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
			"openDatabase",
			"open db=" + database.getDatabaseName() +
			" txnid=none");
			if (debugEnabled())
			{
			debugVerbose("open db=%s txnid=none", database.getDatabaseName());
			}
			}

			// Insert into the list of database handles.
			@@ -3466,8 +3516,10 @@
			Transaction parentTxn = null;
			TransactionConfig txnConfig = null;
			Transaction txn = env.beginTransaction(parentTxn, txnConfig);
			assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
			"beginTransaction", "begin txnid=" + txn.getId());
			if (debugEnabled())
			{
			debugVerbose("beginTransaction", "begin txnid=" + txn.getId());
			}
			return txn;
			}

			@@ -3484,9 +3536,10 @@
			if (txn != null)
			{
			txn.commit();
			assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
			"transactionCommit", "commit txnid=" +
			txn.getId());
			if (debugEnabled())
			{
			debugVerbose("commit txnid=%d", txn.getId());
			}
			}
			}

			@@ -3503,89 +3556,11 @@
			if (txn != null)
			{
			txn.abort();
			assert Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
			"transactionAbort", "abort txnid=" +
			txn.getId());
			}
			}

			/**
			* Debug log a read or write access to the database.
			* @param operation The operation label: "read", "put", "insert".
			* @param category The log category for raw data value logging
			* @param status The JE return status code of the operation.
			* @param database The JE database handle operated on.
			* @param txn The JE transaction handle used in the operation.
			* @param key The database key operated on.
			* @param data The database value read or written.
			* @return true so that the method can be used in an assertion
			* @throws DatabaseException If an error occurs while retrieving information
			* about the JE objects provided to the method.
			*/
			private static boolean debugAccess(String operation,
			DebugLogCategory category,
			OperationStatus status,
			Database database,
			Transaction txn,
			DatabaseEntry key, DatabaseEntry data)
			throws DatabaseException
			{
			// Build the string that is common to category DATABASE_ACCESS and
			// DATABASE_READ/DATABASE_WRITE
			StringBuilder builder = new StringBuilder();
			builder.append(operation);
			if(status != null)
			{
			if (status == OperationStatus.SUCCESS)
			if (debugEnabled())
			{
			builder.append(" (ok)");
			}
			else
			{
			builder.append(" (");
			builder.append(status.toString());
			builder.append(")");
			debugVerbose("abort txnid=%d", txn.getId());
			}
			}
			builder.append(" db=");
			builder.append(database.getDatabaseName());
			if (txn != null)
			{
			builder.append(" txnid=");
			builder.append(txn.getId());
			}
			else
			{
			builder.append(" txnid=none");
			}
			Debug.debugMessage(DATABASE_ACCESS, VERBOSE, CLASS_NAME,
			"debugAccess", builder.toString());

			// If the operation was successful we log the same common information
			// plus the key and data under category DATABASE_READ or DATABASE_WRITE
			if (status == OperationStatus.SUCCESS)
			{
			builder.append(" key:");
			builder.append(ServerConstants.EOL);
			StaticUtils.byteArrayToHexPlusAscii(builder, key.getData(), 0);
			if (data != null)
			{
			builder.append("data(len=");
			builder.append(data.getSize());
			builder.append("):");
			builder.append(ServerConstants.EOL);
			StaticUtils.byteArrayToHexPlusAscii(builder, data.getData(), 0);
			}
			Debug.debugMessage(category, VERBOSE, CLASS_NAME,
			"debugAccess", builder.toString());
			/*
			if (category == DATABASE_WRITE)
			{
			System.out.println(builder.toString());
			}
			*/
			}
			return true;
			}

			/**
			@@ -3603,8 +3578,10 @@
			throws DatabaseException
			{
			OperationStatus status = database.putNoOverwrite(txn, key, data);
			assert debugAccess("insert", DATABASE_WRITE,
			status, database, txn, key, data);
			if (debugEnabled())
			{
			debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key, data);
			}
			return status;
			}

			@@ -3624,8 +3601,11 @@
			throws DatabaseException
			{
			OperationStatus status = cursor.putNoOverwrite(key, data);
			assert debugAccess("cursorInsert", DATABASE_WRITE,
			status, cursor.getDatabase(), null, key, data);
			if (debugEnabled())
			{
			debugJEAccess(DebugLogLevel.VERBOSE, status,
			cursor.getDatabase(), null, key, data);
			}
			return status;
			}

			@@ -3644,8 +3624,10 @@
			throws DatabaseException
			{
			OperationStatus status = database.put(txn, key, data);
			assert debugAccess("put", DATABASE_WRITE,
			status, database, txn, key, data);
			if (debugEnabled())
			{
			debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key, data);
			}
			return status;
			}

			@@ -3665,8 +3647,11 @@
			throws DatabaseException
			{
			OperationStatus status = cursor.put(key, data);
			assert debugAccess("cursorPut", DATABASE_WRITE,
			status, cursor.getDatabase(), null, key, data);
			if (debugEnabled())
			{
			debugJEAccess(DebugLogLevel.VERBOSE, status,
			cursor.getDatabase(), null, key, data);
			}
			return status;
			}

			@@ -3688,8 +3673,10 @@
			throws DatabaseException
			{
			OperationStatus status = database.get(txn, key, data, lockMode);
			assert debugAccess("read", DATABASE_READ,
			status, database, txn, key, data);
			if (debugEnabled())
			{
			debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key, data);
			}
			return status;
			}

			@@ -3711,8 +3698,11 @@
			throws DatabaseException
			{
			OperationStatus status = cursor.getSearchKey(key, data, lockMode);
			assert debugAccess("cursorRead", DATABASE_READ,
			status, cursor.getDatabase(), null, key, data);
			if (debugEnabled())
			{
			debugJEAccess(DebugLogLevel.VERBOSE, status,
			cursor.getDatabase(), null, key, data);
			}
			return status;
			}

			@@ -3730,8 +3720,10 @@
			throws DatabaseException
			{
			OperationStatus status = database.delete(txn, key);
			assert debugAccess("delete", DATABASE_WRITE,
			status, database, txn, key, null);
			if (debugEnabled())
			{
			debugJEAccess(DebugLogLevel.VERBOSE, status, database, txn, key, null);
			}
			return status;
			}

			@@ -3745,8 +3737,11 @@
			public static long count(Database database) throws DatabaseException
			{
			long count = database.count();
			assert debugAccess("count", DATABASE_READ, null, database,
			null, null, null);
			if (debugEnabled())
			{
			debugJEAccess(DebugLogLevel.VERBOSE, OperationStatus.SUCCESS,
			database, null, null, null);
			}
			return count;
			}