commit 6c7e480e0f6263c89e7852c2a4a94c37bca3e2a3
author Alex Karasulu <akarasulu@apache.org> Mon Dec 20 18:30:45 2010 +0000
committer Alex Karasulu <akarasulu@apache.org> Mon Dec 20 18:30:45 2010 +0000
tree 3db9585402c321892bd5d4da45a680beaeab5fd0
parent 0820938aedd3b018fe994ed628cab4f4e4d6ee31

moving more non-ldap related utility classes to shared-util

git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/alex_refactoring@1051234 13f79535-47bb-0310-9956-ffa450edef68

core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java

diff --git a/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java b/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
index c001a78..342b2e3 100644
--- a/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
+++ b/core/src/main/java/org/apache/directory/server/core/authn/PasswordUtil.java
@@ -37,7 +37,7 @@
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.util.Base64;
 import org.apache.directory.shared.util.DateUtils;
-import org.apache.directory.shared.ldap.util.UnixCrypt;
+import org.apache.directory.shared.util.UnixCrypt;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -302,8 +302,8 @@
                 return digest( LdapSecurityConstants.HASH_METHOD_MD5, credentials, salt );
 
             case HASH_METHOD_CRYPT:
-                String saltWithCrypted = UnixCrypt.crypt( Strings.utf8ToString(credentials), Strings
-                    .utf8ToString(salt) );
+                String saltWithCrypted = UnixCrypt.crypt(Strings.utf8ToString(credentials), Strings
+                        .utf8ToString(salt));
                 String crypted = saltWithCrypted.substring( 2 );
 
                 return Strings.getBytesUtf8(crypted);

core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java

diff --git a/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java b/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
index 105d77a..0537458 100644
--- a/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
+++ b/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
@@ -58,7 +58,7 @@
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.util.Base64;
-import org.apache.directory.shared.ldap.util.UnixCrypt;
+import org.apache.directory.shared.util.UnixCrypt;
 import org.apache.directory.shared.util.CharConstants;
 import org.apache.directory.shared.util.Strings;
 

core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java

diff --git a/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java b/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
index 3c68768..1444275 100644
--- a/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
+++ b/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
@@ -45,7 +45,7 @@
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.util.SingletonEnumeration;
+import org.apache.directory.shared.util.SingletonEnumeration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;