Move tools package into private package hierarchy.

matthew_swift

07.38.2009 b69e03bcf756fdeba95b86454445424237d2aefd

Move tools package into private package hierarchy.

 sdk/resource/bin/ldapcompare

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


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

SCRIPT_NAME="ldapcompare"

 sdk/resource/bin/ldapcompare.bat

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

setlocal

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


 sdk/resource/bin/ldapmodify

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

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

SCRIPT_NAME="ldapmodify"

 sdk/resource/bin/ldapmodify.bat

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

setlocal

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


 sdk/resource/bin/ldappasswordmodify

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


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

SCRIPT_NAME="ldappasswordmodify"

 sdk/resource/bin/ldappasswordmodify.bat

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

setlocal

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


 sdk/resource/bin/ldapsearch

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


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

SCRIPT_NAME="ldapsearch"

 sdk/resource/bin/ldapsearch.bat

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

setlocal

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


 sdk/resource/bin/modrate

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


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

SCRIPT_NAME="modrate"

 sdk/resource/bin/modrate.bat

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

setlocal

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


 sdk/resource/bin/searchrate

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


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

SCRIPT_NAME="searchrate"

 sdk/resource/bin/searchrate.bat

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

setlocal

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


 sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java

File was renamed from sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java
@@ -26,7 +26,7 @@
 *      Portions Copyright 2009 Parametric Technology Corporation (PTC)
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/Argument.java

File was renamed from sdk/src/org/opends/sdk/tools/Argument.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/ArgumentException.java

File was renamed from sdk/src/org/opends/sdk/tools/ArgumentException.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/ArgumentGroup.java

File was renamed from sdk/src/org/opends/sdk/tools/ArgumentGroup.java
@@ -25,7 +25,7 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java

File was renamed from sdk/src/org/opends/sdk/tools/ArgumentParser.java
@@ -24,14 +24,14 @@
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



import static com.sun.opends.sdk.messages.Messages.*;
import static com.sun.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.Utils.*;
import static com.sun.opends.sdk.util.StaticUtils.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;

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

 sdk/src/com/sun/opends/sdk/tools/ArgumentParserConnectionFactory.java

File was renamed from sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java
@@ -25,12 +25,12 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.ToolConstants.*;

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

 sdk/src/com/sun/opends/sdk/tools/BooleanArgument.java

File was renamed from sdk/src/org/opends/sdk/tools/BooleanArgument.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/CLIException.java

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




 sdk/src/com/sun/opends/sdk/tools/ConsoleApplication.java

File was renamed from sdk/src/org/opends/sdk/tools/ConsoleApplication.java
@@ -24,12 +24,12 @@
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.Utils.*;
import static com.sun.opends.sdk.tools.Utils.*;

import java.io.*;
import java.util.logging.Level;

 sdk/src/com/sun/opends/sdk/tools/DataSource.java

File was renamed from sdk/src/org/opends/sdk/tools/DataSource.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/DistrustAllTrustManager.java

File was renamed from sdk/src/org/opends/sdk/tools/DistrustAllTrustManager.java
@@ -25,7 +25,7 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;

import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;

 sdk/src/com/sun/opends/sdk/tools/FileBasedArgument.java

File was renamed from sdk/src/org/opends/sdk/tools/FileBasedArgument.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/HostnameMismatchCertificateException.java

File was renamed from sdk/src/org/opends/sdk/tools/HostnameMismatchCertificateException.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/IntegerArgument.java

File was renamed from sdk/src/org/opends/sdk/tools/IntegerArgument.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/LDAPCompare.java

File was renamed from sdk/src/org/opends/sdk/tools/LDAPCompare.java
@@ -25,13 +25,13 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
import static com.sun.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.Utils.*;

import java.io.*;
import java.util.ArrayList;

 sdk/src/com/sun/opends/sdk/tools/LDAPModify.java

File was renamed from sdk/src/org/opends/sdk/tools/LDAPModify.java
@@ -25,13 +25,13 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
import static com.sun.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.Utils.*;

import java.io.FileInputStream;
import java.io.IOException;

 sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java

File was renamed from sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java
@@ -1,8 +1,8 @@
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;

import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
import static com.sun.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.Utils.*;

import java.io.InputStream;
import java.io.OutputStream;

 sdk/src/com/sun/opends/sdk/tools/LDAPSearch.java

File was renamed from sdk/src/org/opends/sdk/tools/LDAPSearch.java
@@ -25,12 +25,12 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.ToolConstants.*;

import java.io.*;
import java.util.ArrayList;

 sdk/src/com/sun/opends/sdk/tools/ModRate.java

File was renamed from sdk/src/org/opends/sdk/tools/ModRate.java
@@ -25,13 +25,13 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
import static com.sun.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.Utils.*;

import java.io.InputStream;
import java.io.OutputStream;

 sdk/src/com/sun/opends/sdk/tools/MultiChoiceArgument.java

File was renamed from sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/MultiColumnPrinter.java

File was renamed from sdk/src/org/opends/sdk/tools/MultiColumnPrinter.java
@@ -24,7 +24,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/PerformanceRunner.java

File was renamed from sdk/src/org/opends/sdk/tools/PerformanceRunner.java
@@ -25,7 +25,7 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/PromptingTrustManager.java

File was renamed from sdk/src/org/opends/sdk/tools/PromptingTrustManager.java
@@ -25,7 +25,7 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/SearchRate.java

File was renamed from sdk/src/org/opends/sdk/tools/SearchRate.java
@@ -25,13 +25,13 @@
 *      Copyright 2009 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



import static com.sun.opends.sdk.messages.Messages.*;
import static org.opends.sdk.tools.ToolConstants.*;
import static org.opends.sdk.tools.Utils.*;
import static com.sun.opends.sdk.tools.ToolConstants.*;
import static com.sun.opends.sdk.tools.Utils.*;

import java.io.InputStream;
import java.io.OutputStream;

 sdk/src/com/sun/opends/sdk/tools/SelectableCertificateKeyManager.java

File was renamed from sdk/src/org/opends/sdk/tools/SelectableCertificateKeyManager.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/StringArgument.java

File was renamed from sdk/src/org/opends/sdk/tools/StringArgument.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/ToolConstants.java

File was renamed from sdk/src/org/opends/sdk/tools/ToolConstants.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;

/**
 * This class defines a number of constants used in one or more

 sdk/src/com/sun/opends/sdk/tools/TrustAllTrustManager.java

File was renamed from sdk/src/org/opends/sdk/tools/TrustAllTrustManager.java
@@ -25,7 +25,7 @@
 *      Copyright 2008 Sun Microsystems, Inc.
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/TrustStoreTrustManager.java

File was renamed from sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java
@@ -26,7 +26,7 @@
 *      Portions Copyright 2009 Parametric Technology Corporation (PTC)
 */

package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;




 sdk/src/com/sun/opends/sdk/tools/Utils.java

File was renamed from sdk/src/org/opends/sdk/tools/Utils.java
@@ -24,7 +24,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;



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

  /**
   * The column at which to wrap long lines of output in the

 sdk/src/com/sun/opends/sdk/tools/package-info.java

File was renamed from sdk/src/org/opends/sdk/tools/package-info.java
@@ -28,4 +28,4 @@
/**
 * Classes implementing the OpenDS SDK client tools.
 */
package org.opends.sdk.tools;
package com.sun.opends.sdk.tools;

 sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java

@@ -44,13 +44,13 @@
/**
 * An abstract SASL context.
 */
public abstract class AbstractSASLContext implements SASLContext,
abstract class AbstractSASLContext implements SASLContext,
    CallbackHandler
{
  /**
   * The name of the default protocol used.
   */
  protected static final String SASL_DEFAULT_PROTOCOL = "ldap";
  static final String SASL_DEFAULT_PROTOCOL = "ldap";



@@ -138,7 +138,7 @@



  protected void handle(AuthorizeCallback callback)
  void handle(AuthorizeCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -149,7 +149,7 @@



  protected void handle(ChoiceCallback callback)
  void handle(ChoiceCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -160,7 +160,7 @@



  protected void handle(ConfirmationCallback callback)
  void handle(ConfirmationCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -171,7 +171,7 @@



  protected void handle(LanguageCallback callback)
  void handle(LanguageCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -182,7 +182,7 @@



  protected void handle(NameCallback callback)
  void handle(NameCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -193,7 +193,7 @@



  protected void handle(PasswordCallback callback)
  void handle(PasswordCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -204,7 +204,7 @@



  protected void handle(RealmCallback callback)
  void handle(RealmCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -215,7 +215,7 @@



  protected void handle(RealmChoiceCallback callback)
  void handle(RealmChoiceCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -226,7 +226,7 @@



  protected void handle(TextInputCallback callback)
  void handle(TextInputCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =
@@ -237,7 +237,7 @@



  protected void handle(TextOutputCallback callback)
  void handle(TextOutputCallback callback)
      throws UnsupportedCallbackException
  {
    com.sun.opends.sdk.util.Message message =