Partial fix for OPENDJ-39: Consider rebranding OpenDS -> OpenDJ in 3.0 tree

Matthew Swift

23.24.2011 d34bf5be3b9fb0cfe6291f35d71bdef728d7120c

Partial fix for OPENDJ-39: Consider rebranding OpenDS -> OpenDJ in 3.0 tree

Rename com.sun.opends.sdk.* to com.forgerock.opendj.ldap.*

 opendj3/opendj-client-tools/src/main/assembly/bat/authrate.bat

@@ -27,7 +27,7 @@

setlocal

set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.AuthRate"
set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.AuthRate"
set SCRIPT_NAME=authrate
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*


 opendj3/opendj-client-tools/src/main/assembly/bat/ldapcompare.bat

@@ -27,7 +27,7 @@

setlocal

set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPCompare"
set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPCompare"
set SCRIPT_NAME=ldapcompare
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*


 opendj3/opendj-client-tools/src/main/assembly/bat/ldapmodify.bat

@@ -27,7 +27,7 @@

setlocal

set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPModify"
set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPModify"
set SCRIPT_NAME=ldapmodify
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*


 opendj3/opendj-client-tools/src/main/assembly/bat/ldappasswordmodify.bat

@@ -27,7 +27,7 @@

setlocal

set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPPasswordModify"
set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPPasswordModify"
set SCRIPT_NAME=ldappasswordmodify
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*


 opendj3/opendj-client-tools/src/main/assembly/bat/ldapsearch.bat

@@ -27,7 +27,7 @@

setlocal

set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPSearch"
set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPSearch"
set SCRIPT_NAME=ldapsearch
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*


 opendj3/opendj-client-tools/src/main/assembly/bat/modrate.bat

@@ -27,7 +27,7 @@

setlocal

set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.ModRate"
set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.ModRate"
set SCRIPT_NAME=modrate
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*


 opendj3/opendj-client-tools/src/main/assembly/bat/searchrate.bat

@@ -27,7 +27,7 @@

setlocal

set OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.SearchRate"
set OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.SearchRate"
set SCRIPT_NAME=searchrate
for %%i in (%~sf0) do call "%%~dPsi\..\lib\_client-script.bat" %*


 opendj3/opendj-client-tools/src/main/assembly/bin/authrate

@@ -27,7 +27,7 @@


# This script may be used to measure auth performance.
OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.AuthRate"
OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.AuthRate"
export OPENDS_INVOKE_CLASS

SCRIPT_NAME="authrate"

 opendj3/opendj-client-tools/src/main/assembly/bin/ldapcompare

@@ -27,7 +27,7 @@


# This script may be used to perform LDAP compare operations.
OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPCompare"
OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPCompare"
export OPENDS_INVOKE_CLASS

SCRIPT_NAME="ldapcompare"

 opendj3/opendj-client-tools/src/main/assembly/bin/ldapmodify

@@ -28,7 +28,7 @@

# This script may be used to perform LDAP add, delete, modify, and modify DN
# operations.
OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPModify"
OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPModify"
export OPENDS_INVOKE_CLASS

SCRIPT_NAME="ldapmodify"

 opendj3/opendj-client-tools/src/main/assembly/bin/ldappasswordmodify

@@ -27,7 +27,7 @@


# This script may be used to perform LDAP password modify operations.
OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPPasswordModify"
OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPPasswordModify"
export OPENDS_INVOKE_CLASS

SCRIPT_NAME="ldappasswordmodify"

 opendj3/opendj-client-tools/src/main/assembly/bin/ldapsearch

@@ -27,7 +27,7 @@


# This script may be used to perform LDAP search operations.
OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.LDAPSearch"
OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.LDAPSearch"
export OPENDS_INVOKE_CLASS

SCRIPT_NAME="ldapsearch"

 opendj3/opendj-client-tools/src/main/assembly/bin/modrate

@@ -27,7 +27,7 @@


# This script may be used to perform LDAP search operations.
OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.ModRate"
OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.ModRate"
export OPENDS_INVOKE_CLASS

SCRIPT_NAME="modrate"

 opendj3/opendj-client-tools/src/main/assembly/bin/searchrate

@@ -27,7 +27,7 @@


# This script may be used to perform LDAP search operations.
OPENDS_INVOKE_CLASS="com.sun.opends.sdk.tools.SearchRate"
OPENDS_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.SearchRate"
export OPENDS_INVOKE_CLASS

SCRIPT_NAME="searchrate"

 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java

@@ -29,7 +29,7 @@


import static org.opends.sdk.CoreMessages.*;
import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;

import java.util.Iterator;
import java.util.LinkedList;

 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java

@@ -29,13 +29,13 @@


import static org.opends.sdk.CoreMessages.*;
import static com.forgerock.opendj.util.StaticUtils.EOL;
import static com.forgerock.opendj.util.StaticUtils.getBytes;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static com.sun.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.Utils.PROPERTY_SCRIPT_NAME;
import static com.sun.opends.sdk.tools.Utils.wrapText;
import static com.sun.opends.sdk.util.StaticUtils.EOL;
import static com.sun.opends.sdk.util.StaticUtils.getBytes;
import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;

import java.io.File;
import java.io.FileInputStream;

 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java

@@ -49,7 +49,7 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.SearchResultEntry;

import com.sun.opends.sdk.util.RecursiveFutureResult;
import com.forgerock.opendj.util.RecursiveFutureResult;




 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java

@@ -33,10 +33,10 @@
import org.opends.sdk.requests.BindRequest;
import org.opends.sdk.responses.BindResult;

import com.sun.opends.sdk.util.AsynchronousConnectionDecorator;
import com.sun.opends.sdk.util.FutureResultTransformer;
import com.sun.opends.sdk.util.RecursiveFutureResult;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.AsynchronousConnectionDecorator;
import com.forgerock.opendj.util.FutureResultTransformer;
import com.forgerock.opendj.util.RecursiveFutureResult;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java

@@ -34,8 +34,9 @@
import java.io.IOException;
import java.util.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;

import org.forgerock.i18n.LocalizableMessage;



 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java

@@ -29,7 +29,7 @@


import static org.opends.sdk.CoreMessages.*;
import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;

import java.io.BufferedReader;
import java.io.File;

 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java

@@ -47,7 +47,7 @@
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;

import com.sun.opends.sdk.util.Base64;
import com.forgerock.opendj.util.Base64;




 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java

@@ -49,8 +49,8 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.responses.SearchResultReference;

import com.sun.opends.sdk.controls.AccountUsabilityResponseControl;
import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java

@@ -44,8 +44,8 @@
import org.opends.sdk.responses.ExtendedResult;
import org.opends.sdk.responses.Result;

import com.forgerock.opendj.util.StaticUtils;
import com.sun.opends.sdk.tools.AuthenticatedConnectionFactory.AuthenticatedAsynchronousConnection;
import com.sun.opends.sdk.util.StaticUtils;




 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java

@@ -52,7 +52,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java

@@ -29,7 +29,7 @@


import static org.opends.sdk.CoreMessages.*;
import static com.sun.opends.sdk.util.StaticUtils.EOL;
import static com.forgerock.opendj.util.StaticUtils.EOL;

import java.io.File;
import java.io.FileInputStream;
@@ -41,9 +41,9 @@
import org.opends.sdk.controls.*;
import org.opends.sdk.responses.BindResult;

import com.sun.opends.sdk.controls.AccountUsabilityRequestControl;
import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
import com.forgerock.opendj.util.StaticUtils;
import com.sun.opends.sdk.tools.AuthenticatedConnectionFactory.AuthenticatedConnection;
import com.sun.opends.sdk.util.StaticUtils;



@@ -55,7 +55,7 @@
  /**
   * The name of a command-line script used to launch a tool.
   */
  static final String PROPERTY_SCRIPT_NAME = "com.sun.opends.sdk.tools.scriptName";
  static final String PROPERTY_SCRIPT_NAME = "com.forgerock.opendj.ldap.tools.scriptName";

  /**
   * The column at which to wrap long lines of output in the command-line tools.

 opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java

@@ -36,7 +36,7 @@

/**
 * An abstract class that all tools unit tests should extend. A tool represents
 * the classes found directly under the package com.sun.opends.sdk.tools.
 * the classes found directly under the package com.forgerock.opendj.ldap.tools.
 */

@Test(groups = { "precommit", "tools", "sdk" })

 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferReader.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferReader.java
@@ -25,14 +25,11 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



import static com.sun.opends.sdk.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_ADDITIONAL_LENGTH_BYTES;
import static com.sun.opends.sdk.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE;
import static com.sun.opends.sdk.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_TYPE;
import static com.sun.opends.sdk.ldap.LDAPConstants.ELEMENT_READ_STATE_NEED_VALUE_BYTES;
import static com.forgerock.opendj.ldap.LDAPConstants.*;
import static org.opends.sdk.CoreMessages.*;

import java.io.IOException;
@@ -49,7 +46,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.AbstractASN1Reader;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/ASN1BufferWriter.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/ASN1BufferWriter.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -46,7 +46,7 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.asn1.AbstractASN1Writer;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPFutureResultImpl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPFutureResultImpl.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -34,7 +34,7 @@
import org.opends.sdk.responses.IntermediateResponse;
import org.opends.sdk.responses.Result;

import com.sun.opends.sdk.util.AsynchronousFutureResult;
import com.forgerock.opendj.util.AsynchronousFutureResult;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/AbstractLDAPMessageHandler.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/AbstractLDAPMessageHandler.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/InternalConnection.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -37,8 +37,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;

import com.sun.opends.sdk.util.CompletedFutureResult;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.CompletedFutureResult;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPBindFutureResultImpl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPBindFutureResultImpl.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPClientFilter.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPClientFilter.java
@@ -25,11 +25,11 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



import static com.sun.opends.sdk.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
import static com.forgerock.opendj.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;

import java.io.EOFException;
import java.io.IOException;

 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPCompareFutureResultImpl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPCompareFutureResultImpl.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnection.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnection.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -51,9 +51,9 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;

import com.sun.opends.sdk.util.CompletedFutureResult;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.CompletedFutureResult;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConnectionFactoryImpl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConnectionFactoryImpl.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -49,9 +49,9 @@
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.Result;

import com.sun.opends.sdk.util.CompletedFutureResult;
import com.sun.opends.sdk.util.FutureResultTransformer;
import com.sun.opends.sdk.util.RecursiveFutureResult;
import com.forgerock.opendj.util.CompletedFutureResult;
import com.forgerock.opendj.util.FutureResultTransformer;
import com.forgerock.opendj.util.RecursiveFutureResult;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPConstants.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPConstants.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransport.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransport.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPExtendedFutureResultImpl.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPFutureResultImpl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPFutureResultImpl.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPListenerImpl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPListenerImpl.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -48,7 +48,7 @@
import org.opends.sdk.LDAPListenerOptions;
import org.opends.sdk.ServerConnectionFactory;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPMessageHandler.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPMessageHandler.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPReader.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPReader.java
@@ -25,11 +25,11 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



import static com.sun.opends.sdk.ldap.LDAPConstants.*;
import static com.forgerock.opendj.ldap.LDAPConstants.*;
import static org.opends.sdk.CoreMessages.ERR_LDAP_MODIFICATION_DECODE_INVALID_MOD_TYPE;
import static org.opends.sdk.CoreMessages.ERR_LDAP_SEARCH_REQUEST_DECODE_INVALID_DEREF;
import static org.opends.sdk.CoreMessages.ERR_LDAP_SEARCH_REQUEST_DECODE_INVALID_SCOPE;
@@ -48,7 +48,7 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPSearchFutureResultImpl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPSearchFutureResultImpl.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPServerFilter.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPServerFilter.java
@@ -25,11 +25,11 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



import static com.sun.opends.sdk.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;
import static com.forgerock.opendj.ldap.LDAPConstants.OID_NOTICE_OF_DISCONNECTION;

import java.io.IOException;
import java.net.InetSocketAddress;
@@ -52,8 +52,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPUtils.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPUtils.java
@@ -25,11 +25,11 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



import static com.sun.opends.sdk.ldap.LDAPConstants.*;
import static com.forgerock.opendj.ldap.LDAPConstants.*;

import java.io.IOException;
import java.util.Collections;

 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPWriter.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/LDAPWriter.java
@@ -25,11 +25,11 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



import static com.sun.opends.sdk.ldap.LDAPConstants.*;
import static com.forgerock.opendj.ldap.LDAPConstants.*;

import java.io.IOException;
import java.util.List;
@@ -44,7 +44,7 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLDecoderTransformer.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLDecoderTransformer.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLEncoderTransformer.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLEncoderTransformer.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/SASLFilter.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/SASLFilter.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/TimeoutChecker.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/TimeoutChecker.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -35,7 +35,7 @@

import org.glassfish.grizzly.utils.LinkedTransferQueue;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedRequestException.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedRequestException.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnexpectedResponseException.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnexpectedResponseException.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/UnsupportedMessageException.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/UnsupportedMessageException.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControl.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.controls;
package com.forgerock.opendj.ldap.controls;



@@ -38,7 +38,7 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.ControlDecoder;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControl.java
@@ -24,12 +24,12 @@
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.controls;
package com.forgerock.opendj.ldap.controls;



import static com.sun.opends.sdk.util.StaticUtils.byteToHex;
import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.byteToHex;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_ACCTUSABLERES_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.ERR_ACCTUSABLERES_DECODE_ERROR;
import static org.opends.sdk.CoreMessages.ERR_ACCTUSABLERES_NO_CONTROL_VALUE;
@@ -48,8 +48,8 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.ControlDecoder;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/RealAttributesOnlyRequestControl.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.controls;
package com.forgerock.opendj.ldap.controls;



@@ -38,7 +38,7 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.ControlDecoder;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/VirtualAttributesOnlyRequestControl.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.controls;
package com.forgerock.opendj.ldap.controls;



@@ -38,7 +38,7 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.controls.ControlDecoder;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/controls/package-info.java
@@ -28,7 +28,7 @@
/**
 * Classes implementing Sun proprietary LDAP controls.
 */
package com.sun.opends.sdk.controls;
package com.forgerock.opendj.ldap.controls;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedRequest.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetConnectionIDExtendedResult.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;



@@ -38,7 +38,7 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.responses.AbstractExtendedResult;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;


/**

 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/GetSymmetricKeyExtendedRequest.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;



@@ -48,7 +48,7 @@
import org.opends.sdk.responses.ExtendedResultDecoder;
import org.opends.sdk.responses.Responses;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedRequest.java
@@ -25,12 +25,12 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;



import static com.sun.opends.sdk.util.StaticUtils.formatAsGeneralizedTime;
import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.formatAsGeneralizedTime;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_PWPSTATE_EXTOP_DECODE_FAILURE;
import static org.opends.sdk.CoreMessages.ERR_PWPSTATE_EXTOP_NO_REQUEST_VALUE;
import static org.opends.sdk.CoreMessages.ERR_PWPSTATE_EXTOP_UNKNOWN_OP_TYPE;
@@ -54,7 +54,7 @@
import org.opends.sdk.responses.ExtendedResult;
import org.opends.sdk.responses.ExtendedResultDecoder;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateExtendedResult.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperation.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationContainer.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/PasswordPolicyStateOperationType.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/extensions/package-info.java
@@ -28,7 +28,7 @@
/**
 * Classes implementing Sun proprietary LDAP extended operations.
 */
package com.sun.opends.sdk.extensions;
package com.forgerock.opendj.ldap.extensions;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/ldap/package-info.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/ldap/package-info.java
@@ -28,7 +28,7 @@
/**
 * Classes implementing LDAP protocol.
 */
package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ASCIICharProp.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousConnectionDecorator.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousConnectionDecorator.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/AsynchronousFutureResult.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/AsynchronousFutureResult.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Base64.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Base64.java
@@ -24,11 +24,11 @@
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;



import static com.sun.opends.sdk.util.Validator.ensureNotNull;
import static com.forgerock.opendj.util.Validator.ensureNotNull;
import static org.opends.sdk.CoreMessages.ERR_BASE64_DECODE_INVALID_CHARACTER;
import static org.opends.sdk.CoreMessages.ERR_BASE64_DECODE_INVALID_LENGTH;


 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/ByteSequenceOutputStream.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/ByteSequenceOutputStream.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Collections2.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Collections2.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/CompletedFutureResult.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/CompletedFutureResult.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Function.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Function.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Functions.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Functions.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/FutureResultTransformer.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/FutureResultTransformer.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterables.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterables.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Iterators.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Iterators.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Predicate.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Predicate.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/RecursiveFutureResult.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/RecursiveFutureResult.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SizeLimitInputStream.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StaticUtils.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StaticUtils.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/StringPrepProfile.java
@@ -24,11 +24,11 @@
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 */
package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;



import static com.sun.opends.sdk.util.Validator.ensureNotNull;
import static com.forgerock.opendj.util.Validator.ensureNotNull;

import java.text.Normalizer;
import java.text.Normalizer.Form;

 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/SubstringReader.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/SubstringReader.java
@@ -25,7 +25,7 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/Validator.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/Validator.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/com/forgerock/opendj/util/package-info.java

File was renamed from opendj3/opendj-sdk/src/main/java/com/sun/opends/sdk/util/package-info.java
@@ -28,7 +28,7 @@
/**
 * Classes providing utility functionality.
 */
package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/AVA.java

@@ -30,7 +30,7 @@



import static com.sun.opends.sdk.util.StaticUtils.*;
import static com.forgerock.opendj.util.StaticUtils.*;
import static org.opends.sdk.CoreMessages.*;

import java.util.Comparator;
@@ -39,9 +39,9 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.schema.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractAttribute.java

@@ -34,7 +34,7 @@
import org.opends.sdk.schema.AttributeType;
import org.opends.sdk.schema.MatchingRule;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractConnection.java

@@ -44,7 +44,7 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractEntry.java

@@ -33,9 +33,9 @@

import org.forgerock.i18n.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.Iterables;
import com.sun.opends.sdk.util.Predicate;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Iterables;
import com.forgerock.opendj.util.Predicate;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractLoadBalancingAlgorithm.java

@@ -40,9 +40,9 @@

import org.opends.sdk.responses.Responses;

import com.sun.opends.sdk.util.AsynchronousFutureResult;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.AsynchronousFutureResult;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/AbstractMapEntry.java

@@ -32,7 +32,7 @@
import java.util.Collection;
import java.util.Map;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/AttributeDescription.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;

import java.util.*;
@@ -40,9 +40,9 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;

import com.sun.opends.sdk.util.ASCIICharProp;
import com.sun.opends.sdk.util.Iterators;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.ASCIICharProp;
import com.forgerock.opendj.util.Iterators;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/Attributes.java

@@ -35,8 +35,8 @@

import org.opends.sdk.schema.AttributeType;

import com.sun.opends.sdk.util.Iterators;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Iterators;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/AuthenticatedConnectionFactory.java

@@ -32,9 +32,9 @@
import org.opends.sdk.requests.BindRequest;
import org.opends.sdk.responses.BindResult;

import com.sun.opends.sdk.util.AsynchronousConnectionDecorator;
import com.sun.opends.sdk.util.FutureResultTransformer;
import com.sun.opends.sdk.util.RecursiveFutureResult;
import com.forgerock.opendj.util.AsynchronousConnectionDecorator;
import com.forgerock.opendj.util.FutureResultTransformer;
import com.forgerock.opendj.util.RecursiveFutureResult;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteString.java

@@ -35,7 +35,7 @@
import java.nio.charset.Charset;
import java.util.logging.Level;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ByteStringBuilder.java

@@ -34,7 +34,7 @@
import java.nio.ByteBuffer;
import java.util.logging.Level;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ConnectionPool.java

@@ -41,10 +41,10 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.AsynchronousFutureResult;
import com.sun.opends.sdk.util.CompletedFutureResult;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.AsynchronousFutureResult;
import com.forgerock.opendj.util.CompletedFutureResult;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/Connections.java

@@ -35,7 +35,7 @@
import org.opends.sdk.requests.BindRequest;
import org.opends.sdk.requests.SearchRequest;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/DN.java

@@ -38,8 +38,8 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;

import com.sun.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.SubstringReader;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/DecodeOptions.java

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

import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/Entries.java

@@ -36,9 +36,9 @@
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.requests.Requests;

import com.sun.opends.sdk.util.Function;
import com.sun.opends.sdk.util.Iterables;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Function;
import com.forgerock.opendj.util.Iterables;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ErrorResultIOException.java

@@ -31,7 +31,7 @@

import java.io.IOException;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/Filter.java

@@ -29,9 +29,9 @@



import static com.sun.opends.sdk.util.StaticUtils.byteToHex;
import static com.sun.opends.sdk.util.StaticUtils.getBytes;
import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.byteToHex;
import static com.forgerock.opendj.util.StaticUtils.getBytes;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;

import java.util.*;
@@ -40,8 +40,8 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/HeartBeatConnectionFactory.java

@@ -42,10 +42,10 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.responses.SearchResultReference;

import com.sun.opends.sdk.util.AsynchronousConnectionDecorator;
import com.sun.opends.sdk.util.FutureResultTransformer;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.AsynchronousConnectionDecorator;
import com.forgerock.opendj.util.FutureResultTransformer;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/InternalConnectionFactory.java

@@ -29,8 +29,8 @@



import com.sun.opends.sdk.ldap.InternalConnection;
import com.sun.opends.sdk.util.CompletedFutureResult;
import com.forgerock.opendj.ldap.InternalConnection;
import com.forgerock.opendj.util.CompletedFutureResult;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/KeyManagers.java

@@ -38,7 +38,7 @@

import javax.net.ssl.*;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPConnectionFactory.java

@@ -33,8 +33,8 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;

import com.sun.opends.sdk.ldap.LDAPConnectionFactoryImpl;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.ldap.LDAPConnectionFactoryImpl;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListener.java

@@ -35,8 +35,8 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;

import com.sun.opends.sdk.ldap.LDAPListenerImpl;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.ldap.LDAPListenerImpl;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPListenerOptions.java

@@ -33,7 +33,7 @@

import org.glassfish.grizzly.nio.transport.TCPNIOTransport;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPOptions.java

@@ -37,7 +37,7 @@

import org.glassfish.grizzly.nio.transport.TCPNIOTransport;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/LDAPUrl.java

@@ -39,8 +39,8 @@
import org.opends.sdk.requests.SearchRequest;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedAttribute.java

@@ -33,7 +33,7 @@

import org.forgerock.i18n.LocalizedIllegalArgumentException;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/LinkedHashMapEntry.java

@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.requests.Requests;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/LoadBalancer.java

@@ -29,8 +29,8 @@



import com.sun.opends.sdk.util.CompletedFutureResult;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.CompletedFutureResult;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/Matcher.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.DEBUG_LOG;
import static com.forgerock.opendj.util.StaticUtils.DEBUG_LOG;

import java.util.ArrayList;
import java.util.List;
@@ -41,7 +41,7 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/Modification.java

@@ -29,7 +29,7 @@



import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/RDN.java

@@ -42,8 +42,8 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;

import com.sun.opends.sdk.util.Iterators;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.Iterators;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/RootDSE.java

@@ -37,7 +37,7 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.opends.sdk.schema.CoreSchema;

import com.sun.opends.sdk.util.*;
import com.forgerock.opendj.util.*;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/SearchResultReferenceIOException.java

@@ -33,7 +33,7 @@

import org.opends.sdk.responses.SearchResultReference;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/SortKey.java

@@ -37,7 +37,7 @@
import org.opends.sdk.schema.MatchingRule;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/SynchronousConnection.java

@@ -36,7 +36,7 @@
import org.opends.sdk.responses.*;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/TreeMapEntry.java

@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.requests.Requests;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/TrustManagers.java

@@ -49,7 +49,7 @@

import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1.java

@@ -37,7 +37,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;

import com.sun.opends.sdk.util.ByteSequenceOutputStream;
import com.forgerock.opendj.util.ByteSequenceOutputStream;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1ByteSequenceReader.java

@@ -44,7 +44,7 @@
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1InputStreamReader.java

@@ -45,8 +45,8 @@
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.SizeLimitInputStream;
import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.SizeLimitInputStream;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/asn1/ASN1OutputStreamWriter.java

@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteStringBuilder;

import com.sun.opends.sdk.util.ByteSequenceOutputStream;
import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.ByteSequenceOutputStream;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AssertionRequestControl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_LDAPASSERT_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.ERR_LDAPASSERT_INVALID_CONTROL_VALUE;
import static org.opends.sdk.CoreMessages.ERR_LDAPASSERT_NO_CONTROL_VALUE;
@@ -42,8 +42,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.ldap.LDAPUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.ldap.LDAPUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityRequestControl.java

@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/AuthorizationIdentityResponseControl.java

@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/EntryChangeNotificationResponseControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;
import static org.opends.sdk.asn1.ASN1Constants.UNIVERSAL_INTEGER_TYPE;
import static org.opends.sdk.asn1.ASN1Constants.UNIVERSAL_OCTET_STRING_TYPE;
@@ -43,8 +43,8 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GenericControl.java

@@ -30,8 +30,8 @@

import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/GetEffectiveRightsRequestControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;

import java.io.IOException;
@@ -44,7 +44,7 @@
import org.opends.sdk.schema.Schema;
import org.opends.sdk.schema.UnknownSchemaElementException;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ManageDsaITRequestControl.java

@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/MatchedValuesRequestControl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;

import java.io.IOException;
@@ -42,9 +42,9 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.ldap.LDAPUtils;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.ldap.LDAPUtils;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiredResponseControl.java

@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordExpiringResponseControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_PWEXPIRING_CANNOT_DECODE_SECONDS_UNTIL_EXPIRATION;
import static org.opends.sdk.CoreMessages.ERR_PWEXPIRING_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.ERR_PWEXPIRING_NO_CONTROL_VALUE;
@@ -38,8 +38,8 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyRequestControl.java

@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PasswordPolicyResponseControl.java

@@ -28,8 +28,8 @@



import static com.sun.opends.sdk.util.StaticUtils.byteToHex;
import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.byteToHex;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;

import java.io.IOException;
@@ -43,8 +43,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PermissiveModifyRequestControl.java

@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PersistentSearchRequestControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_PSEARCH_BAD_CHANGE_TYPES;
import static org.opends.sdk.CoreMessages.ERR_PSEARCH_CANNOT_DECODE_VALUE;
import static org.opends.sdk.CoreMessages.ERR_PSEARCH_CONTROL_BAD_OID;
@@ -46,8 +46,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadRequestControl.java

@@ -45,8 +45,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PostReadResponseControl.java

@@ -43,9 +43,9 @@
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.SearchResultEntry;

import com.sun.opends.sdk.ldap.LDAPUtils;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.ldap.LDAPUtils;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadRequestControl.java

@@ -45,8 +45,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/PreReadResponseControl.java

@@ -43,9 +43,9 @@
import org.opends.sdk.responses.Responses;
import org.opends.sdk.responses.SearchResultEntry;

import com.sun.opends.sdk.ldap.LDAPUtils;
import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.ldap.LDAPUtils;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV1RequestControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;

import java.io.IOException;
@@ -41,8 +41,8 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ProxiedAuthV2RequestControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;

import java.io.IOException;
@@ -41,8 +41,8 @@
import org.opends.sdk.asn1.ASN1;
import org.opends.sdk.asn1.ASN1Reader;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortRequestControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.*;

import java.io.IOException;
@@ -41,7 +41,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/ServerSideSortResponseControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_SORTRES_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.INFO_SORTRES_CONTROL_CANNOT_DECODE_VALUE;
import static org.opends.sdk.CoreMessages.INFO_SORTRES_CONTROL_NO_VALUE;
@@ -43,7 +43,7 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SimplePagedResultsControl.java

@@ -41,8 +41,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubentriesRequestControl.java

@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/SubtreeDeleteRequestControl.java

@@ -36,7 +36,7 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.DecodeOptions;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewRequestControl.java

@@ -28,8 +28,8 @@



import static com.sun.opends.sdk.util.StaticUtils.byteToHex;
import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.byteToHex;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_VLVREQ_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.INFO_VLVREQ_CONTROL_CANNOT_DECODE_VALUE;
import static org.opends.sdk.CoreMessages.INFO_VLVREQ_CONTROL_INVALID_TARGET_TYPE;
@@ -46,7 +46,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/controls/VirtualListViewResponseControl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_VLVRES_CONTROL_BAD_OID;
import static org.opends.sdk.CoreMessages.INFO_VLVRES_CONTROL_CANNOT_DECODE_VALUE;
import static org.opends.sdk.CoreMessages.INFO_VLVRES_CONTROL_NO_VALUE;
@@ -41,7 +41,7 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1Writer;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFReader.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;

import java.io.BufferedReader;
@@ -46,8 +46,8 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.Base64;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Base64;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/AbstractLDIFWriter.java

@@ -40,8 +40,8 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.controls.Control;

import com.sun.opends.sdk.util.Base64;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Base64;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionChangeRecordWriter.java

@@ -40,7 +40,7 @@
import org.opends.sdk.requests.ModifyDNRequest;
import org.opends.sdk.requests.ModifyRequest;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryReader.java

@@ -39,7 +39,7 @@
import org.opends.sdk.requests.SearchRequest;
import org.opends.sdk.responses.*;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/ConnectionEntryWriter.java

@@ -36,7 +36,7 @@
import org.opends.sdk.ErrorResultException;
import org.opends.sdk.ErrorResultIOException;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordReader.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;

import java.io.IOException;
@@ -47,7 +47,7 @@
import org.opends.sdk.requests.Requests;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFChangeRecordWriter.java

@@ -40,7 +40,7 @@
import org.opends.sdk.requests.ModifyRequest;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryReader.java

@@ -44,7 +44,7 @@
import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/ldif/LDIFEntryWriter.java

@@ -36,7 +36,7 @@
import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractExtendedRequest.java

@@ -33,7 +33,7 @@
import org.opends.sdk.responses.ExtendedResult;
import org.opends.sdk.responses.ExtendedResultDecoder;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractRequestImpl.java

@@ -38,7 +38,7 @@
import org.opends.sdk.controls.ControlDecoder;
import org.opends.sdk.controls.GenericControl;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractSASLBindRequest.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.ldap.LDAPConstants.TYPE_AUTHENTICATION_SASL;
import static com.forgerock.opendj.ldap.LDAPConstants.TYPE_AUTHENTICATION_SASL;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AbstractUnmodifiableRequest.java

@@ -38,10 +38,10 @@
import org.opends.sdk.controls.ControlDecoder;
import org.opends.sdk.controls.GenericControl;

import com.sun.opends.sdk.util.Collections2;
import com.sun.opends.sdk.util.Function;
import com.sun.opends.sdk.util.Functions;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Collections2;
import com.forgerock.opendj.util.Function;
import com.forgerock.opendj.util.Functions;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/AnonymousSASLBindRequestImpl.java

@@ -31,7 +31,7 @@

import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CRAMMD5SASLBindRequestImpl.java

@@ -42,7 +42,7 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.Responses;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CancelExtendedRequestImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_EXTOP_CANCEL_CANNOT_DECODE_REQUEST_VALUE;
import static org.opends.sdk.CoreMessages.ERR_EXTOP_CANCEL_NO_REQUEST_VALUE;


 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/CompareRequestImpl.java

@@ -34,7 +34,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DN;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DeleteRequestImpl.java

@@ -33,7 +33,7 @@
import org.opends.sdk.DN;
import org.opends.sdk.ldif.ChangeRecordVisitor;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/DigestMD5SASLBindRequestImpl.java

@@ -29,8 +29,8 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.util.StaticUtils.joinCollection;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.joinCollection;
import static org.opends.sdk.CoreMessages.ERR_SASL_PROTOCOL_ERROR;

import java.util.*;
@@ -51,7 +51,7 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.Responses;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GSSAPISASLBindRequestImpl.java

@@ -29,8 +29,8 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.sun.opends.sdk.util.StaticUtils.joinCollection;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.joinCollection;
import static org.opends.sdk.CoreMessages.ERR_LDAPAUTH_GSSAPI_LOCAL_AUTHENTICATION_FAILED;
import static org.opends.sdk.CoreMessages.ERR_SASL_CONTEXT_CREATE_ERROR;
import static org.opends.sdk.CoreMessages.ERR_SASL_PROTOCOL_ERROR;
@@ -53,8 +53,8 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.Responses;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;
import com.sun.security.auth.callback.TextCallbackHandler;
import com.sun.security.auth.module.Krb5LoginModule;


 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericBindRequestImpl.java

@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ErrorResultException;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/GenericExtendedRequestImpl.java

@@ -36,8 +36,8 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.responses.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyDNRequestImpl.java

@@ -34,7 +34,7 @@
import org.opends.sdk.RDN;
import org.opends.sdk.ldif.ChangeRecordVisitor;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/ModifyRequestImpl.java

@@ -36,7 +36,7 @@
import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecordVisitor;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PasswordModifyExtendedRequestImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getExceptionMessage;
import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage;
import static org.opends.sdk.CoreMessages.ERR_EXTOP_PASSMOD_CANNOT_DECODE_REQUEST;

import java.io.IOException;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/PlainSASLBindRequestImpl.java

@@ -42,7 +42,7 @@
import org.opends.sdk.responses.BindResult;
import org.opends.sdk.responses.Responses;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/Requests.java

@@ -40,7 +40,7 @@
import org.opends.sdk.ldif.ChangeRecord;
import org.opends.sdk.ldif.LDIFChangeRecordReader;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SearchRequestImpl.java

@@ -38,7 +38,7 @@
import org.opends.sdk.Filter;
import org.opends.sdk.SearchScope;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/SimpleBindRequestImpl.java

@@ -29,12 +29,12 @@



import static com.sun.opends.sdk.ldap.LDAPConstants.TYPE_AUTHENTICATION_SIMPLE;
import static com.forgerock.opendj.ldap.LDAPConstants.TYPE_AUTHENTICATION_SIMPLE;

import org.opends.sdk.ByteString;
import org.opends.sdk.ErrorResultException;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/StartTLSExtendedRequestImpl.java

@@ -41,7 +41,7 @@
import org.opends.sdk.controls.Control;
import org.opends.sdk.responses.*;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;


/**

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableAddRequestImpl.java

@@ -33,8 +33,8 @@
import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecordVisitor;

import com.sun.opends.sdk.util.Function;
import com.sun.opends.sdk.util.Iterables;
import com.forgerock.opendj.util.Function;
import com.forgerock.opendj.util.Iterables;

/**
 * Unmodifiable add request implementation.

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/requests/UnmodifiableModifyRequestImpl.java

@@ -34,9 +34,9 @@
import org.opends.sdk.*;
import org.opends.sdk.ldif.ChangeRecordVisitor;

import com.sun.opends.sdk.util.Collections2;
import com.sun.opends.sdk.util.Function;
import com.sun.opends.sdk.util.Functions;
import com.forgerock.opendj.util.Collections2;
import com.forgerock.opendj.util.Function;
import com.forgerock.opendj.util.Functions;

/**
 * Unmodifiable modify request implementation.

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractExtendedResult.java

@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractIntermediateResponse.java

@@ -31,7 +31,7 @@

import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResponseImpl.java

@@ -38,7 +38,7 @@
import org.opends.sdk.controls.ControlDecoder;
import org.opends.sdk.controls.GenericControl;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;


/**

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractResultImpl.java

@@ -34,7 +34,7 @@

import org.opends.sdk.ResultCode;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/AbstractUnmodifiableResponseImpl.java

@@ -38,10 +38,10 @@
import org.opends.sdk.controls.ControlDecoder;
import org.opends.sdk.controls.GenericControl;

import com.sun.opends.sdk.util.Collections2;
import com.sun.opends.sdk.util.Function;
import com.sun.opends.sdk.util.Functions;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Collections2;
import com.forgerock.opendj.util.Function;
import com.forgerock.opendj.util.Functions;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericExtendedResultImpl.java

@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.ResultCode;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/GenericIntermediateResponseImpl.java

@@ -31,7 +31,7 @@

import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/Responses.java

@@ -32,7 +32,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/SearchResultReferenceImpl.java

@@ -32,7 +32,7 @@
import java.util.LinkedList;
import java.util.List;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/responses/UnmodifiableSearchResultEntryImpl.java

@@ -32,8 +32,8 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.Function;
import com.sun.opends.sdk.util.Iterables;
import com.forgerock.opendj.util.Function;
import com.forgerock.opendj.util.Iterables;

/**
 * Unmodifiable Search result entry implementation.

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AbstractSubstringMatchingRuleImpl.java

@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeType.java

@@ -40,8 +40,8 @@

import org.forgerock.i18n.LocalizableMessage;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/AttributeTypeSyntaxImpl.java

@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5EqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;

import org.forgerock.i18n.LocalizableMessage;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactIA5SubstringMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;

import org.forgerock.i18n.LocalizableMessage;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactOrderingMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseExactSubstringMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;

import org.forgerock.i18n.LocalizableMessage;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER;

import org.forgerock.i18n.LocalizableMessage;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreListSubstringMatchingRuleImpl.java

@@ -28,14 +28,14 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StringPrepProfile;
import com.forgerock.opendj.util.StringPrepProfile;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreOrderingMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CaseIgnoreSubstringMatchingRuleImpl.java

@@ -28,14 +28,14 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StringPrepProfile;
import com.forgerock.opendj.util.StringPrepProfile;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/CountryStringSyntaxImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_COUNTRY_STRING_NOT_PRINTABLE;
import static org.opends.sdk.schema.SchemaConstants.*;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRule.java

@@ -35,7 +35,7 @@

import org.forgerock.i18n.LocalizableMessage;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITContentRuleSyntaxImpl.java

@@ -40,8 +40,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRule.java

@@ -36,7 +36,7 @@

import org.forgerock.i18n.LocalizableMessage;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DITStructureRuleSyntaxImpl.java

@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DeliveryMethodSyntaxImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS;
import static org.opends.sdk.schema.SchemaConstants.*;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_EMPTY_VALUE;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_EXPECTED_OPEN_PARENTHESIS;

@@ -40,7 +40,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DistinguishedNameEqualityMatchingRuleImpl.java

@@ -28,7 +28,7 @@



import static com.sun.opends.sdk.util.StaticUtils.getBytes;
import static com.forgerock.opendj.util.StaticUtils.getBytes;

import java.util.Iterator;
import java.util.TreeSet;
@@ -36,7 +36,7 @@
import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;


/**

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java

@@ -31,7 +31,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnhancedGuideSyntaxImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
@@ -39,7 +39,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumOrderingMatchingRule.java

@@ -34,7 +34,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/EnumSyntaxImpl.java

@@ -29,9 +29,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_INVALID_VALUE;
import static org.opends.sdk.schema.SchemaConstants.AMR_DOUBLE_METAPHONE_OID;
import static org.opends.sdk.schema.SchemaConstants.EMR_CASE_IGNORE_OID;
@@ -47,7 +47,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/FacsimileNumberSyntaxImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_FAXNUMBER_EMPTY;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_FAXNUMBER_END_WITH_DOLLAR;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_FAXNUMBER_ILLEGAL_PARAMETER;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GeneralizedTimeSyntaxImpl.java

@@ -41,7 +41,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/GuideSyntaxImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.*;
import static org.opends.sdk.schema.SchemaConstants.EMR_OCTET_STRING_OID;
import static org.opends.sdk.schema.SchemaConstants.OMR_OCTET_STRING_OID;
@@ -39,7 +39,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerEqualityMatchingRuleImpl.java

@@ -35,7 +35,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java

@@ -35,8 +35,8 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.sdk.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/IntegerOrderingMatchingRuleImpl.java

@@ -35,7 +35,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/KeywordEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.*;


 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/LDAPSyntaxDescriptionSyntaxImpl.java

@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRule.java

@@ -43,7 +43,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleSyntaxImpl.java

@@ -41,8 +41,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUse.java

@@ -36,7 +36,7 @@

import org.forgerock.i18n.LocalizableMessage;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/MatchingRuleUseSyntaxImpl.java

@@ -43,8 +43,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameForm.java

@@ -38,7 +38,7 @@

import org.forgerock.i18n.LocalizableMessage;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NameFormSyntaxImpl.java

@@ -40,8 +40,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringOrderingMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSubstringMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.NO_CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.NO_CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/NumericStringSyntaxImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.isDigit;
import static com.forgerock.opendj.util.StaticUtils.isDigit;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_NUMERIC_STRING_EMPTY_VALUE;
import static org.opends.sdk.CoreMessages.WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR;
import static org.opends.sdk.schema.SchemaConstants.EMR_NUMERIC_STRING_OID;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/OIDSyntaxImpl.java

@@ -37,7 +37,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClass.java

@@ -38,7 +38,7 @@

import org.forgerock.i18n.LocalizableMessage;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectClassSyntaxImpl.java

@@ -40,8 +40,8 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierEqualityMatchingRuleImpl.java

@@ -30,8 +30,8 @@

import org.opends.sdk.*;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java

@@ -37,7 +37,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/PresentationAddressEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/ProtocolInformationEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/RegexSyntaxImpl.java

@@ -41,7 +41,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Schema.java

@@ -44,9 +44,9 @@
import org.opends.sdk.responses.Result;
import org.opends.sdk.responses.SearchResultEntry;

import com.sun.opends.sdk.util.FutureResultTransformer;
import com.sun.opends.sdk.util.RecursiveFutureResult;
import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.FutureResultTransformer;
import com.forgerock.opendj.util.RecursiveFutureResult;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaBuilder.java

@@ -50,9 +50,9 @@
import org.opends.sdk.DecodeException;
import org.opends.sdk.Entry;

import com.sun.opends.sdk.util.StaticUtils;
import com.sun.opends.sdk.util.SubstringReader;
import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.StaticUtils;
import com.forgerock.opendj.util.SubstringReader;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaElement.java

@@ -36,7 +36,7 @@

import org.forgerock.i18n.LocalizableMessage;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/SchemaUtils.java

@@ -28,8 +28,8 @@



import static com.sun.opends.sdk.util.StaticUtils.isAlpha;
import static com.sun.opends.sdk.util.StaticUtils.isDigit;
import static com.forgerock.opendj.util.StaticUtils.isAlpha;
import static com.forgerock.opendj.util.StaticUtils.isDigit;
import static org.opends.sdk.CoreMessages.*;

import java.util.*;
@@ -37,7 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.SubstringReader;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/Syntax.java

@@ -41,7 +41,7 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.sdk.ByteSequence;

import com.sun.opends.sdk.util.Validator;
import com.forgerock.opendj.util.Validator;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberEqualityMatchingRuleImpl.java

@@ -31,7 +31,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSubstringMatchingRuleImpl.java

@@ -31,7 +31,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.ByteString;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/TelephoneNumberSyntaxImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.isDigit;
import static com.forgerock.opendj.util.StaticUtils.isDigit;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_TELEPHONE_EMPTY;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_TELEPHONE_ILLEGAL_CHAR;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_TELEPHONE_NO_DIGITS;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UTCTimeSyntaxImpl.java

@@ -41,7 +41,7 @@
import org.opends.sdk.ByteSequence;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordExactEqualityMatchingRuleImpl.java

@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.opends.sdk.DecodeException;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/UserPasswordSyntaxImpl.java

@@ -29,7 +29,7 @@



import static com.sun.opends.sdk.util.StaticUtils.toLowerCase;
import static com.forgerock.opendj.util.StaticUtils.toLowerCase;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_USERPW_NO_CLOSING_BRACE;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_USERPW_NO_OPENING_BRACE;
import static org.opends.sdk.CoreMessages.ERR_ATTR_SYNTAX_USERPW_NO_SCHEME;

 opendj3/opendj-sdk/src/main/java/org/opends/sdk/schema/WordEqualityMatchingRuleImpl.java

@@ -28,9 +28,9 @@



import static com.sun.opends.sdk.util.StringPrepProfile.CASE_FOLD;
import static com.sun.opends.sdk.util.StringPrepProfile.TRIM;
import static com.sun.opends.sdk.util.StringPrepProfile.prepareUnicode;
import static com.forgerock.opendj.util.StringPrepProfile.CASE_FOLD;
import static com.forgerock.opendj.util.StringPrepProfile.TRIM;
import static com.forgerock.opendj.util.StringPrepProfile.prepareUnicode;

import org.opends.sdk.*;


 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferReaderTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferReaderTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -37,6 +37,8 @@
import org.opends.sdk.asn1.ASN1Reader;
import org.opends.sdk.asn1.ASN1ReaderTestCase;

import com.forgerock.opendj.ldap.ASN1BufferReader;



/**

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/ASN1BufferWriterTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/ASN1BufferWriterTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -40,6 +40,9 @@
import org.opends.sdk.asn1.ASN1Writer;
import org.opends.sdk.asn1.ASN1WriterTestCase;

import com.forgerock.opendj.ldap.ASN1BufferReader;
import com.forgerock.opendj.ldap.ASN1BufferWriter;



/**

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPDefaultTCPNIOTransportTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPDefaultTCPNIOTransportTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -37,6 +37,8 @@
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
import org.testng.annotations.Test;

import com.forgerock.opendj.ldap.LDAPDefaultTCPNIOTransport;



/**

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.ldap;
package com.forgerock.opendj.ldap;



@@ -36,7 +36,7 @@

/**
 * An abstract class that all ldap unit tests should extend. Ldap represents the
 * classes found directly under the package com.sun.opends.sdk.ldap.
 * classes found directly under the package com.forgerock.opendj.ldap.ldap.
 */

@Test(groups = { "precommit", "ldap", "sdk" })

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityRequestControlTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.controls;
package com.forgerock.opendj.ldap.controls;



@@ -42,6 +42,8 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.testng.annotations.Test;

import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;



/**

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/controls/AccountUsabilityResponseControlTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.controls;
package com.forgerock.opendj.ldap.controls;



@@ -43,6 +43,9 @@
import org.opends.sdk.responses.SearchResultEntry;
import org.testng.annotations.Test;

import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl;



/**

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/ASCIICharPropTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;



@@ -35,6 +35,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import com.forgerock.opendj.util.ASCIICharProp;



/**

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/Base64TestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/Base64TestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;



@@ -37,11 +37,12 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import com.forgerock.opendj.util.Base64;



/**
 * This class defines a set of tests for the {@link org.opends.sdk.util.Base64}
 * class.
 * This class defines a set of tests for the {@link Base64} class.
 */
public final class Base64TestCase extends UtilTestCase
{

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StaticUtilsTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;



@@ -38,6 +38,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import com.forgerock.opendj.util.StaticUtils;



/**

 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/StringPrepProfileTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/test/java/com/forgerock/opendj/util/UtilTestCase.java

File was renamed from opendj3/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

package com.sun.opends.sdk.util;
package com.forgerock.opendj.util;




 opendj3/opendj-sdk/src/test/java/org/opends/sdk/ConnectionFactoryTestCase.java

@@ -53,7 +53,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPListenerTestCase.java

@@ -41,7 +41,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/test/java/org/opends/sdk/LDAPServer.java

@@ -30,7 +30,7 @@



import static com.sun.opends.sdk.ldap.LDAPConstants.TYPE_AUTHENTICATION_SASL;
import static com.forgerock.opendj.ldap.LDAPConstants.TYPE_AUTHENTICATION_SASL;

import java.io.IOException;
import java.util.*;
@@ -50,8 +50,8 @@
import org.opends.sdk.requests.*;
import org.opends.sdk.responses.*;

import com.sun.opends.sdk.controls.AccountUsabilityRequestControl;
import com.sun.opends.sdk.controls.AccountUsabilityResponseControl;
import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl;




 opendj3/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java

@@ -42,7 +42,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import com.sun.opends.sdk.util.StaticUtils;
import com.forgerock.opendj.util.StaticUtils;




 opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/BindRequestTestCase.java

@@ -33,7 +33,7 @@

import org.testng.annotations.Test;

import com.sun.opends.sdk.ldap.LDAPConstants;
import com.forgerock.opendj.ldap.LDAPConstants;




 opendj3/opendj-sdk/src/test/java/org/opends/sdk/requests/GenericBindRequestTestCase.java

@@ -32,7 +32,7 @@
import org.opends.sdk.ByteString;
import org.testng.annotations.DataProvider;

import com.sun.opends.sdk.ldap.LDAPConstants;
import com.forgerock.opendj.ldap.LDAPConstants;




 opendj3/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaUtilsTest.java

@@ -33,7 +33,7 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import com.sun.opends.sdk.util.SubstringReader;
import com.forgerock.opendj.util.SubstringReader;