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

Matthew Swift

23.50.2011 703564fb6772df87af21d1c2c38f309de509232b

 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

 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
}


 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Argument.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentException.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentGroup.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/tools/ArgumentGroup.java
@@ -25,7 +25,7 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 */

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




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ArgumentParser.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/AuthenticatedConnectionFactory.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/BooleanArgument.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/CLIException.java

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




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProvider.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ConsoleApplication.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/FileBasedArgument.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/IntegerArgument.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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.*;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiChoiceArgument.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/MultiColumnPrinter.java

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

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




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactory.java

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

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




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;

 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/StringArgument.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/ToolConstants.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




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

File was renamed from opendj3/opendj-client-tools/src/main/java/com/sun/opends/sdk/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;




 opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/PerfToolTCPNIOTransportFactoryTestCase.java

File was renamed from opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/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;



/**

 opendj3/opendj-client-tools/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java

File was renamed from opendj3/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
@@ -25,7 +25,7 @@
 *      Copyright 2010 Sun Microsystems, Inc.
 */

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