From 190c0b4e77a93ea30bb6f6b6d0df70a72e29838b Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 May 2011 16:50:37 +0000
Subject: [PATCH] Partial fix for OPENDJ-39: Consider rebranding OpenDS -> OpenDJ in 3.0 tree
---
opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbin/_script-util.sh | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java | 6 +-
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java | 6 +-
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java | 6 +-
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java | 4
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java | 6 +-
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java | 4
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java | 4
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java | 8 +-
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java | 6 +-
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java | 6 +-
opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactoryTestCase.java | 4 +
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java | 6 +-
opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbat/_script-util.bat | 17 -----
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactory.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java | 2
opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java | 6 +-
33 files changed, 57 insertions(+), 70 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbat/_script-util.bat b/opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbat/_script-util.bat
index 046888c..53522dd 100755
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbat/_script-util.bat
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbat/_script-util.bat
@@ -132,17 +132,10 @@
:setEnvironmentVars
if %SET_ENVIRONMENT_VARS_DONE% == "true" goto prepareCheck
set PATH=%SystemRoot%;%PATH%
-set SCRIPT_NAME_ARG=-Dcom.sun.opends.sdk.tools.scriptName=%SCRIPT_NAME%
+set SCRIPT_NAME_ARG=-Dcom.forgerock.opendj.ldap.tools.scriptName=%SCRIPT_NAME%
set SET_ENVIRONMENT_VARS_DONE=true
goto scriptBegin
-:testJava
-"%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% org.opends.server.tools.InstallDS -t > NUL 2>&1
-set RESULT_CODE=%errorlevel%
-if %RESULT_CODE% == 13 goto notSupportedJavaHome
-if not %RESULT_CODE% == 0 goto noValidJavaHome
-goto prepareCheck
-
:noValidJavaHome
if NOT "%OPENDS_JAVA_ARGS%" == "" goto noValidHomeWithArgs
echo ERROR: The detected Java version could not be used. The detected
@@ -204,13 +197,5 @@
if "%NO_CHECK%" == "" set NO_CHECK=false
goto isVersionOrHelp
-:check
-if "%NO_CHECK%" == "true" goto end
-if "%CHECK_VERSION%" == "true" set OPT_CHECK_VERSION=--checkVersion
-"%OPENDS_JAVA_BIN%" %SCRIPT_NAME_ARG% -DINSTALL_ROOT="%INSTALL_ROOT%" -DINSTANCE_ROOT="%INSTANCE_ROOT%" org.opends.server.tools.configurator.CheckInstance %OPT_CHECK_VERSION%
-set RESULT_CODE=%errorlevel%
-if "%RESULT_CODE%" == "0" goto end
-exit /B 1
-
:end
exit /B 0
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbin/_script-util.sh b/opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbin/_script-util.sh
index 7189c81..3519f4c 100755
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbin/_script-util.sh
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/assembly/libbin/_script-util.sh
@@ -78,7 +78,7 @@
LD_PRELOAD_64=
export PATH LD_LIBRARY_PATH LD_LIBRARY_PATH_32 LD_LIBRARY_PATH_64 \
LD_PRELOAD LD_PRELOAD_32 LD_PRELOAD_64
- SCRIPT_NAME_ARG=-Dcom.sun.opends.sdk.tools.scriptName=${SCRIPT_NAME}
+ SCRIPT_NAME_ARG=-Dcom.forgerock.opendj.ldap.tools.scriptName=${SCRIPT_NAME}
export SCRIPT_NAME_ARG
}
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ApplicationKeyManager.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ApplicationKeyManager.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java
index b58578e..d15be47 100755
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ApplicationKeyManager.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java
@@ -26,7 +26,7 @@
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java
index 4971564..f309b19 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Argument.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentException.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java
similarity index 97%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentException.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java
index 80a6adc..ed4d9a0 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentException.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java
index f476d4c..818c4c5 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java
@@ -25,7 +25,7 @@
* Copyright 2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java
index 801b8a6..aefbf36 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentParser.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java
@@ -24,18 +24,18 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.Utils.PROPERTY_SCRIPT_NAME;
+import static com.forgerock.opendj.ldap.tools.Utils.wrapText;
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 java.io.File;
import java.io.FileInputStream;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index 3a31a29..9bd7410 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthRate.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -25,13 +25,13 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
-import static com.sun.opends.sdk.tools.ToolConstants.*;
-import static com.sun.opends.sdk.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java
index ffa56b8..5f55a3c 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/AuthenticatedConnectionFactory.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/BooleanArgument.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/BooleanArgument.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java
index c328292..6d78a2e 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/BooleanArgument.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/CLIException.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/CLIException.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java
index 631134f..f6f690a 100755
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/CLIException.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java
@@ -24,7 +24,7 @@
*
* Copyright 2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConnectionFactoryProvider.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConnectionFactoryProvider.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
index 3b1715b..2ad8267 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConnectionFactoryProvider.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java
@@ -25,12 +25,12 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
-import static com.sun.opends.sdk.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
import java.io.File;
import java.io.FileInputStream;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConsoleApplication.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConsoleApplication.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java
index 967351e..506521e 100755
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ConsoleApplication.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java
@@ -24,15 +24,15 @@
*
* Copyright 2008-2009 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.INFO_ERROR_EMPTY_RESPONSE;
import static org.forgerock.opendj.ldap.CoreMessages.INFO_MENU_PROMPT_RETURN_TO_CONTINUE;
import static org.forgerock.opendj.ldap.CoreMessages.INFO_PROMPT_SINGLE_DEFAULT;
-import static com.sun.opends.sdk.tools.Utils.MAX_LINE_WIDTH;
-import static com.sun.opends.sdk.tools.Utils.wrapText;
+import static com.forgerock.opendj.ldap.tools.Utils.MAX_LINE_WIDTH;
+import static com.forgerock.opendj.ldap.tools.Utils.wrapText;
import java.io.*;
import java.util.logging.Level;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java
index 6b124c4..3a88109 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/DataSource.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java
@@ -25,7 +25,7 @@
* Copyright 2009-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java
index a1ecea7..7f1a56f 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/FileBasedArgument.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/IntegerArgument.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/IntegerArgument.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java
index d4337f5..faa989e 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/IntegerArgument.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
index 18b3055..30ad0e0 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPCompare.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
@@ -25,13 +25,13 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
-import static com.sun.opends.sdk.tools.ToolConstants.*;
-import static com.sun.opends.sdk.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
import java.io.*;
import java.util.ArrayList;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPModify.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPModify.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
index e7a00c0..7801591 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPModify.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
@@ -25,13 +25,13 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
-import static com.sun.opends.sdk.tools.ToolConstants.*;
-import static com.sun.opends.sdk.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPPasswordModify.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPPasswordModify.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
index bc80817..12ad977 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPPasswordModify.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
@@ -25,13 +25,13 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
-import static com.sun.opends.sdk.tools.ToolConstants.*;
-import static com.sun.opends.sdk.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
index 714c969..78b4b8f 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/LDAPSearch.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
@@ -25,13 +25,13 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
-import static com.sun.opends.sdk.tools.ToolConstants.*;
-import static com.sun.opends.sdk.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
import java.io.*;
import java.util.*;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ModRate.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ModRate.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
index 0e6cd09..d7206c2 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ModRate.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
@@ -25,13 +25,13 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
-import static com.sun.opends.sdk.tools.ToolConstants.*;
-import static com.sun.opends.sdk.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiChoiceArgument.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiChoiceArgument.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java
index 89cc6f7..79e3185 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiChoiceArgument.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiColumnPrinter.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiColumnPrinter.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java
index f0bcd44..87d6312 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/MultiColumnPrinter.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactory.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactory.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactory.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactory.java
index 174f73b..c3c03a1 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactory.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactory.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
index 922e7d8..b1ba078 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PerformanceRunner.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
@@ -44,8 +44,8 @@
import org.forgerock.opendj.ldap.responses.ExtendedResult;
import org.forgerock.opendj.ldap.responses.Result;
+import com.forgerock.opendj.ldap.tools.AuthenticatedConnectionFactory.*;
import com.forgerock.opendj.util.StaticUtils;
-import com.sun.opends.sdk.tools.AuthenticatedConnectionFactory.AuthenticatedAsynchronousConnection;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java
index 316b2fb..8e505a0 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/PromptingTrustManager.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java
@@ -25,7 +25,7 @@
* Copyright 2008-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/SearchRate.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/SearchRate.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
index 3b36152..5c8eb02 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/SearchRate.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
@@ -25,13 +25,13 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
import static org.forgerock.opendj.ldap.CoreMessages.*;
-import static com.sun.opends.sdk.tools.ToolConstants.*;
-import static com.sun.opends.sdk.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/StringArgument.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java
similarity index 98%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/StringArgument.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java
index c714df9..7a7e746 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/StringArgument.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ToolConstants.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ToolConstants.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java
index 9eba321..9f04853 100755
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ToolConstants.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
similarity index 99%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
index b7e13d0..9d2ce52 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/Utils.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
@@ -24,7 +24,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
@@ -42,8 +42,8 @@
import org.forgerock.opendj.ldap.responses.BindResult;
import com.forgerock.opendj.ldap.controls.AccountUsabilityRequestControl;
+import com.forgerock.opendj.ldap.tools.AuthenticatedConnectionFactory.AuthenticatedConnection;
import com.forgerock.opendj.util.StaticUtils;
-import com.sun.opends.sdk.tools.AuthenticatedConnectionFactory.AuthenticatedConnection;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/package-info.java b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java
similarity index 95%
rename from opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/package-info.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java
index 227eb18..459986c 100755
--- a/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/package-info.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java
@@ -28,7 +28,7 @@
/**
* Classes implementing the OpenDS SDK client tools.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactoryTestCase.java b/opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactoryTestCase.java
similarity index 94%
rename from opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactoryTestCase.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactoryTestCase.java
index a008ccd..27ac125 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/PerfToolTCPNIOTransportFactoryTestCase.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactoryTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
@@ -38,6 +38,8 @@
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
import org.testng.annotations.Test;
+import com.forgerock.opendj.ldap.tools.PerfToolTCPNIOTransportFactory;
+
/**
diff --git a/opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java b/opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java
similarity index 96%
rename from opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
rename to opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java
index 2c256d1..4056c92 100644
--- a/opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
+++ b/opendj-sdk/opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java
@@ -25,7 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
-package com.sun.opends.sdk.tools;
+package com.forgerock.opendj.ldap.tools;
--
Gitblit v1.10.0