From 6bc01e03cbaf1fa491cbe9a0adc1f6f187de83ff Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 07 Dec 2009 13:38:25 +0000
Subject: [PATCH] Move tools package into private package hierarchy.
---
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentException.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/FileBasedArgument.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentParserConnectionFactory.java | 4
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ConsoleApplication.java | 4
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentGroup.java | 2
opendj-sdk/sdk/resource/bin/modrate.bat | 2
opendj-sdk/sdk/resource/bin/searchrate.bat | 2
opendj-sdk/sdk/resource/bin/ldapmodify.bat | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/HostnameMismatchCertificateException.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/DataSource.java | 2
opendj-sdk/sdk/resource/bin/ldapmodify | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java | 6 +-
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/BooleanArgument.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/package-info.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/SelectableCertificateKeyManager.java | 2
opendj-sdk/sdk/resource/bin/ldappasswordmodify | 2
opendj-sdk/sdk/resource/bin/searchrate | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/StringArgument.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/PromptingTrustManager.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPModify.java | 6 +-
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/PerformanceRunner.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/DistrustAllTrustManager.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/IntegerArgument.java | 2
opendj-sdk/sdk/resource/bin/ldapcompare | 2
opendj-sdk/sdk/resource/bin/modrate | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/Argument.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPCompare.java | 6 +-
opendj-sdk/sdk/resource/bin/ldapcompare.bat | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/MultiChoiceArgument.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/SearchRate.java | 6 +-
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/CLIException.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java | 6 +-
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ModRate.java | 6 +-
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ToolConstants.java | 2
opendj-sdk/sdk/resource/bin/ldappasswordmodify.bat | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/TrustStoreTrustManager.java | 2
opendj-sdk/sdk/resource/bin/ldapsearch.bat | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/Utils.java | 4
opendj-sdk/sdk/resource/bin/ldapsearch | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/MultiColumnPrinter.java | 2
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/TrustAllTrustManager.java | 2
opendj-sdk/sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java | 24 ++++----
opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPSearch.java | 4
44 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/opendj-sdk/sdk/resource/bin/ldapcompare b/opendj-sdk/sdk/resource/bin/ldapcompare
index 26ca941..2b42932 100755
--- a/opendj-sdk/sdk/resource/bin/ldapcompare
+++ b/opendj-sdk/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"
diff --git a/opendj-sdk/sdk/resource/bin/ldapcompare.bat b/opendj-sdk/sdk/resource/bin/ldapcompare.bat
index 0c5eec5..30310fe 100755
--- a/opendj-sdk/sdk/resource/bin/ldapcompare.bat
+++ b/opendj-sdk/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" %*
diff --git a/opendj-sdk/sdk/resource/bin/ldapmodify b/opendj-sdk/sdk/resource/bin/ldapmodify
index db11fc0..a42accf 100755
--- a/opendj-sdk/sdk/resource/bin/ldapmodify
+++ b/opendj-sdk/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"
diff --git a/opendj-sdk/sdk/resource/bin/ldapmodify.bat b/opendj-sdk/sdk/resource/bin/ldapmodify.bat
index 7ad361d..960e31d 100755
--- a/opendj-sdk/sdk/resource/bin/ldapmodify.bat
+++ b/opendj-sdk/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" %*
diff --git a/opendj-sdk/sdk/resource/bin/ldappasswordmodify b/opendj-sdk/sdk/resource/bin/ldappasswordmodify
index 8d88905..2156425 100755
--- a/opendj-sdk/sdk/resource/bin/ldappasswordmodify
+++ b/opendj-sdk/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"
diff --git a/opendj-sdk/sdk/resource/bin/ldappasswordmodify.bat b/opendj-sdk/sdk/resource/bin/ldappasswordmodify.bat
index beaf907..baf984a 100755
--- a/opendj-sdk/sdk/resource/bin/ldappasswordmodify.bat
+++ b/opendj-sdk/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" %*
diff --git a/opendj-sdk/sdk/resource/bin/ldapsearch b/opendj-sdk/sdk/resource/bin/ldapsearch
index a827ce1..f4c983d 100755
--- a/opendj-sdk/sdk/resource/bin/ldapsearch
+++ b/opendj-sdk/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"
diff --git a/opendj-sdk/sdk/resource/bin/ldapsearch.bat b/opendj-sdk/sdk/resource/bin/ldapsearch.bat
index 59e86d7..19577f2 100755
--- a/opendj-sdk/sdk/resource/bin/ldapsearch.bat
+++ b/opendj-sdk/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" %*
diff --git a/opendj-sdk/sdk/resource/bin/modrate b/opendj-sdk/sdk/resource/bin/modrate
index 2dd6853..4266c03 100755
--- a/opendj-sdk/sdk/resource/bin/modrate
+++ b/opendj-sdk/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"
diff --git a/opendj-sdk/sdk/resource/bin/modrate.bat b/opendj-sdk/sdk/resource/bin/modrate.bat
index 54b700c..f4bffb8 100755
--- a/opendj-sdk/sdk/resource/bin/modrate.bat
+++ b/opendj-sdk/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" %*
diff --git a/opendj-sdk/sdk/resource/bin/searchrate b/opendj-sdk/sdk/resource/bin/searchrate
index cabe427..250bf69 100755
--- a/opendj-sdk/sdk/resource/bin/searchrate
+++ b/opendj-sdk/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"
diff --git a/opendj-sdk/sdk/resource/bin/searchrate.bat b/opendj-sdk/sdk/resource/bin/searchrate.bat
index d4b35ff..a2f2014 100755
--- a/opendj-sdk/sdk/resource/bin/searchrate.bat
+++ b/opendj-sdk/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" %*
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ApplicationKeyManager.java
index 1b1b93d..1b76900 100755
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/ApplicationKeyManager.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/Argument.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/Argument.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/Argument.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/Argument.java
index d45d080..0dfc925 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/Argument.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentException.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentException.java
similarity index 98%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentException.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentException.java
index 8ab872b..b443aa8 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentException.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentGroup.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentGroup.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentGroup.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentGroup.java
index 7036c76..8c8a2bc 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentGroup.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentParser.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentParser.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentParser.java
index 43ea641..2b86b2b 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentParser.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentParserConnectionFactory.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ArgumentParserConnectionFactory.java
index ca4008b..7d2bf3f 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/ArgumentParserConnectionFactory.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/BooleanArgument.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/BooleanArgument.java
similarity index 98%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/BooleanArgument.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/BooleanArgument.java
index 1b21806..6e051e6 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/BooleanArgument.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/CLIException.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/CLIException.java
similarity index 98%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/CLIException.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/CLIException.java
index 8f6f3f7..f9f7c2c 100755
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/CLIException.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/ConsoleApplication.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ConsoleApplication.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/ConsoleApplication.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ConsoleApplication.java
index 35a2ac7..d21f6da 100755
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/ConsoleApplication.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/DataSource.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/DataSource.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/DataSource.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/DataSource.java
index 9a40b8a..5e6dd9a 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/DataSource.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/DistrustAllTrustManager.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/DistrustAllTrustManager.java
similarity index 97%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/DistrustAllTrustManager.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/DistrustAllTrustManager.java
index c9ec73a..aed7cca 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/DistrustAllTrustManager.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/FileBasedArgument.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/FileBasedArgument.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/FileBasedArgument.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/FileBasedArgument.java
index 7079bb4..1540586 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/FileBasedArgument.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/HostnameMismatchCertificateException.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/HostnameMismatchCertificateException.java
similarity index 98%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/HostnameMismatchCertificateException.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/HostnameMismatchCertificateException.java
index b022bbd..29012df 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/HostnameMismatchCertificateException.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/IntegerArgument.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/IntegerArgument.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/IntegerArgument.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/IntegerArgument.java
index fe259b8..272a714 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/IntegerArgument.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPCompare.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPCompare.java
similarity index 98%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPCompare.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPCompare.java
index 2335a2b..b6d57fd 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPCompare.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPModify.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPModify.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPModify.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPModify.java
index cd51316..93e656a 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPModify.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java
similarity index 98%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPPasswordModify.java
index 6afa574..437698a 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPPasswordModify.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPSearch.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPSearch.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPSearch.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/LDAPSearch.java
index 78c4680..dd0e6d7 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/LDAPSearch.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/ModRate.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ModRate.java
similarity index 98%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/ModRate.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ModRate.java
index 7878db6..f4aa9d5 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/ModRate.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/MultiChoiceArgument.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/MultiChoiceArgument.java
index 57629d2..781ac3a 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/MultiChoiceArgument.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/MultiColumnPrinter.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/MultiColumnPrinter.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/MultiColumnPrinter.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/MultiColumnPrinter.java
index 61454cc..1f80177 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/MultiColumnPrinter.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/PerformanceRunner.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/PerformanceRunner.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/PerformanceRunner.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/PerformanceRunner.java
index 8e29882..db2f113 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/PerformanceRunner.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/PromptingTrustManager.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/PromptingTrustManager.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/PromptingTrustManager.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/PromptingTrustManager.java
index 2fa188b..400ee46 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/PromptingTrustManager.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/SearchRate.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/SearchRate.java
similarity index 98%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/SearchRate.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/SearchRate.java
index 65de1d1..9c4f156 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/SearchRate.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/SelectableCertificateKeyManager.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/SelectableCertificateKeyManager.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/SelectableCertificateKeyManager.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/SelectableCertificateKeyManager.java
index dac98c8..d412d7b 100755
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/SelectableCertificateKeyManager.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/StringArgument.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/StringArgument.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/StringArgument.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/StringArgument.java
index 831ef52..e80bd46 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/StringArgument.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/ToolConstants.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ToolConstants.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/ToolConstants.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/ToolConstants.java
index af5fbfc..54b9c87 100755
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/ToolConstants.java
+++ b/opendj-sdk/sdk/src/com/sun/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
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/TrustAllTrustManager.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/TrustAllTrustManager.java
similarity index 97%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/TrustAllTrustManager.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/TrustAllTrustManager.java
index 3d0cbd0..5facfc5 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/TrustAllTrustManager.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/TrustStoreTrustManager.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/TrustStoreTrustManager.java
index 15dc826..fe4525d 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/TrustStoreTrustManager.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/Utils.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/Utils.java
similarity index 99%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/Utils.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/Utils.java
index 54fde42..ed04169 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/Utils.java
+++ b/opendj-sdk/sdk/src/com/sun/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
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/tools/package-info.java b/opendj-sdk/sdk/src/com/sun/opends/sdk/tools/package-info.java
similarity index 96%
rename from opendj-sdk/sdk/src/org/opends/sdk/tools/package-info.java
rename to opendj-sdk/sdk/src/com/sun/opends/sdk/tools/package-info.java
index 0715d9f..66ea32f 100755
--- a/opendj-sdk/sdk/src/org/opends/sdk/tools/package-info.java
+++ b/opendj-sdk/sdk/src/com/sun/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;
diff --git a/opendj-sdk/sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java b/opendj-sdk/sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java
index e9e0ca0..e4582bf 100644
--- a/opendj-sdk/sdk/src/org/opends/sdk/sasl/AbstractSASLContext.java
+++ b/opendj-sdk/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 =
--
Gitblit v1.10.0