Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 44867 invoked from network); 11 Feb 2006 03:54:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Feb 2006 03:54:35 -0000 Received: (qmail 57086 invoked by uid 500); 11 Feb 2006 03:54:33 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 56970 invoked by uid 500); 11 Feb 2006 03:54:32 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 56866 invoked by uid 99); 11 Feb 2006 03:54:31 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2006 19:54:31 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 10 Feb 2006 19:54:24 -0800 Received: (qmail 44470 invoked by uid 65534); 11 Feb 2006 03:54:03 -0000 Message-ID: <20060211035403.44469.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r376922 [4/5] - in /directory/sandbox/akarasulu/rc1: ./ apacheds/kerberos-shared/src/main/java/org/apache/directory/ apacheds/kerberos-shared/src/main/java/org/apache/directory/server/ apacheds/kerberos-shared/src/main/java/org/apache/direc... Date: Sat, 11 Feb 2006 03:53:17 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Copied: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java (from r376905, directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/kerberos/store/PrincipalStoreEntryModifier.java) URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?p2=directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java&p1=directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/kerberos/store/PrincipalStoreEntryModifier.java&r1=376905&r2=376922&rev=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/kerberos/store/PrincipalStoreEntryModifier.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java Fri Feb 10 19:52:58 2006 @@ -14,13 +14,13 @@ * limitations under the License. * */ -package org.apache.kerberos.store; +package org.apache.directory.server.kerberos.shared.store; import javax.security.auth.kerberos.KerberosPrincipal; -import org.apache.kerberos.messages.value.KerberosTime; -import org.apache.kerberos.messages.value.SamType; +import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; +import org.apache.directory.server.kerberos.shared.messages.value.SamType; public class PrincipalStoreEntryModifier Propchange: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java ------------------------------------------------------------------------------ svn:keywords = Rev Copied: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java (from r376905, directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/kerberos/store/SingleBaseSearch.java) URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java?p2=directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java&p1=directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/kerberos/store/SingleBaseSearch.java&r1=376905&r2=376922&rev=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/kerberos/store/SingleBaseSearch.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java Fri Feb 10 19:52:58 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.kerberos.store; +package org.apache.directory.server.kerberos.shared.store; import java.util.Hashtable; @@ -28,13 +28,13 @@ import javax.security.auth.kerberos.KerberosPrincipal; import org.apache.directory.server.core.configuration.ConfigurationException; +import org.apache.directory.server.kerberos.shared.store.operations.AddPrincipal; +import org.apache.directory.server.kerberos.shared.store.operations.ChangePassword; +import org.apache.directory.server.kerberos.shared.store.operations.DeletePrincipal; +import org.apache.directory.server.kerberos.shared.store.operations.GetAllPrincipals; +import org.apache.directory.server.kerberos.shared.store.operations.GetPrincipal; import org.apache.directory.server.protocol.shared.ServiceConfiguration; import org.apache.directory.server.protocol.shared.store.ContextOperation; -import org.apache.kerberos.store.operations.AddPrincipal; -import org.apache.kerberos.store.operations.ChangePassword; -import org.apache.kerberos.store.operations.DeletePrincipal; -import org.apache.kerberos.store.operations.GetAllPrincipals; -import org.apache.kerberos.store.operations.GetPrincipal; /** Propchange: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/AddPrincipal.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/AddPrincipal.java?rev=376922&r1=376905&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/AddPrincipal.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/AddPrincipal.java Fri Feb 10 19:52:58 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.kerberos.store.operations; +package org.apache.directory.server.kerberos.shared.store.operations; import javax.naming.Name; @@ -29,9 +29,9 @@ import javax.naming.spi.DirStateFactory; import javax.naming.spi.DirStateFactory.Result; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; import org.apache.directory.server.protocol.shared.store.ContextOperation; import org.apache.directory.shared.ldap.name.LdapName; -import org.apache.kerberos.store.PrincipalStoreEntry; /** Modified: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=376922&r1=376905&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Fri Feb 10 19:52:58 2006 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.store.operations; +package org.apache.directory.server.kerberos.shared.store.operations; import java.util.Properties; @@ -33,8 +33,8 @@ import javax.security.auth.kerberos.KerberosKey; import javax.security.auth.kerberos.KerberosPrincipal; +import org.apache.directory.server.kerberos.shared.store.KerberosAttribute; import org.apache.directory.server.protocol.shared.store.ContextOperation; -import org.apache.kerberos.store.KerberosAttribute; /** Modified: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java?rev=376922&r1=376905&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/DeletePrincipal.java Fri Feb 10 19:52:58 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.kerberos.store.operations; +package org.apache.directory.server.kerberos.shared.store.operations; import java.util.Properties; @@ -31,8 +31,8 @@ import javax.naming.directory.SearchResult; import javax.security.auth.kerberos.KerberosPrincipal; +import org.apache.directory.server.kerberos.shared.store.KerberosAttribute; import org.apache.directory.server.protocol.shared.store.ContextOperation; -import org.apache.kerberos.store.KerberosAttribute; /** Modified: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java?rev=376922&r1=376905&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetAllPrincipals.java Fri Feb 10 19:52:58 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.kerberos.store.operations; +package org.apache.directory.server.kerberos.shared.store.operations; import java.util.ArrayList; @@ -30,11 +30,11 @@ import javax.naming.directory.SearchResult; import javax.security.auth.kerberos.KerberosPrincipal; +import org.apache.directory.server.kerberos.shared.messages.value.SamType; +import org.apache.directory.server.kerberos.shared.store.KerberosAttribute; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntryModifier; import org.apache.directory.server.protocol.shared.store.ContextOperation; -import org.apache.kerberos.messages.value.SamType; -import org.apache.kerberos.store.KerberosAttribute; -import org.apache.kerberos.store.PrincipalStoreEntry; -import org.apache.kerberos.store.PrincipalStoreEntryModifier; /** Modified: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=376922&r1=376905&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Fri Feb 10 19:52:58 2006 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.store.operations; +package org.apache.directory.server.kerberos.shared.store.operations; import javax.naming.Name; @@ -27,11 +27,11 @@ import javax.naming.directory.SearchResult; import javax.security.auth.kerberos.KerberosPrincipal; +import org.apache.directory.server.kerberos.shared.messages.value.SamType; +import org.apache.directory.server.kerberos.shared.store.KerberosAttribute; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntryModifier; import org.apache.directory.server.protocol.shared.store.ContextOperation; -import org.apache.kerberos.messages.value.SamType; -import org.apache.kerberos.store.KerberosAttribute; -import org.apache.kerberos.store.PrincipalStoreEntry; -import org.apache.kerberos.store.PrincipalStoreEntryModifier; /** Modified: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalObjectFactory.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalObjectFactory.java?rev=376922&r1=376905&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalObjectFactory.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalObjectFactory.java Fri Feb 10 19:52:58 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.kerberos.store.operations; +package org.apache.directory.server.kerberos.shared.store.operations; import java.util.Hashtable; @@ -26,8 +26,8 @@ import javax.naming.spi.DirObjectFactory; import javax.security.auth.kerberos.KerberosPrincipal; -import org.apache.kerberos.store.KerberosAttribute; -import org.apache.kerberos.store.PrincipalStoreEntryModifier; +import org.apache.directory.server.kerberos.shared.store.KerberosAttribute; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntryModifier; /** Modified: directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java?rev=376922&r1=376905&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/PrincipalStateFactory.java Fri Feb 10 19:52:58 2006 @@ -15,7 +15,7 @@ * */ -package org.apache.kerberos.store.operations; +package org.apache.directory.server.kerberos.shared.store.operations; import java.util.Hashtable; @@ -30,8 +30,8 @@ import javax.naming.directory.SchemaViolationException; import javax.naming.spi.DirStateFactory; -import org.apache.kerberos.store.KerberosAttribute; -import org.apache.kerberos.store.PrincipalStoreEntry; +import org.apache.directory.server.kerberos.shared.store.KerberosAttribute; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; /** Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordConfiguration.java Fri Feb 10 19:52:58 2006 @@ -28,9 +28,9 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.configuration.ConfigurationException; +import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType; import org.apache.directory.server.protocol.shared.LoadStrategy; import org.apache.directory.server.protocol.shared.ServiceConfiguration; -import org.apache.kerberos.crypto.encryption.EncryptionType; public class ChangePasswordConfiguration extends ServiceConfiguration Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java Fri Feb 10 19:52:58 2006 @@ -22,7 +22,7 @@ import java.util.Dictionary; import org.apache.directory.server.changepw.protocol.ChangePasswordProtocolHandler; -import org.apache.kerberos.store.PrincipalStore; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.mina.common.IoHandler; import org.apache.mina.common.TransportType; import org.apache.mina.registry.Service; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/exceptions/ChangePasswordException.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/exceptions/ChangePasswordException.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/exceptions/ChangePasswordException.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/exceptions/ChangePasswordException.java Fri Feb 10 19:52:58 2006 @@ -18,7 +18,7 @@ package org.apache.directory.server.changepw.exceptions; -import org.apache.kerberos.exceptions.KerberosException; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; /** Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataDecoder.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataDecoder.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataDecoder.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordDataDecoder.java Fri Feb 10 19:52:58 2006 @@ -23,13 +23,13 @@ import org.apache.directory.server.changepw.value.ChangePasswordData; import org.apache.directory.server.changepw.value.ChangePasswordDataModifier; +import org.apache.directory.server.kerberos.shared.io.decoder.PrincipalNameDecoder; import org.apache.directory.shared.asn1.der.ASN1InputStream; import org.apache.directory.shared.asn1.der.DEREncodable; import org.apache.directory.shared.asn1.der.DERGeneralString; import org.apache.directory.shared.asn1.der.DEROctetString; import org.apache.directory.shared.asn1.der.DERSequence; import org.apache.directory.shared.asn1.der.DERTaggedObject; -import org.apache.kerberos.io.decoder.PrincipalNameDecoder; public class ChangePasswordDataDecoder Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java Fri Feb 10 19:52:58 2006 @@ -22,8 +22,8 @@ import java.nio.ByteBuffer; import org.apache.directory.server.changepw.messages.ChangePasswordError; -import org.apache.kerberos.io.encoder.ErrorMessageEncoder; -import org.apache.kerberos.messages.ErrorMessage; +import org.apache.directory.server.kerberos.shared.io.encoder.ErrorMessageEncoder; +import org.apache.directory.server.kerberos.shared.messages.ErrorMessage; public class ChangePasswordErrorEncoder Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordReplyEncoder.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordReplyEncoder.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordReplyEncoder.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordReplyEncoder.java Fri Feb 10 19:52:58 2006 @@ -22,10 +22,10 @@ import java.nio.ByteBuffer; import org.apache.directory.server.changepw.messages.ChangePasswordReply; -import org.apache.kerberos.io.encoder.ApplicationReplyEncoder; -import org.apache.kerberos.io.encoder.PrivateMessageEncoder; -import org.apache.kerberos.messages.application.ApplicationReply; -import org.apache.kerberos.messages.application.PrivateMessage; +import org.apache.directory.server.kerberos.shared.io.encoder.ApplicationReplyEncoder; +import org.apache.directory.server.kerberos.shared.io.encoder.PrivateMessageEncoder; +import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply; +import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; public class ChangePasswordReplyEncoder Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java Fri Feb 10 19:52:58 2006 @@ -22,10 +22,10 @@ import org.apache.directory.server.changepw.messages.ChangePasswordRequest; import org.apache.directory.server.changepw.messages.ChangePasswordRequestModifier; -import org.apache.kerberos.io.decoder.ApplicationRequestDecoder; -import org.apache.kerberos.io.decoder.PrivateMessageDecoder; -import org.apache.kerberos.messages.ApplicationRequest; -import org.apache.kerberos.messages.application.PrivateMessage; +import org.apache.directory.server.kerberos.shared.io.decoder.ApplicationRequestDecoder; +import org.apache.directory.server.kerberos.shared.io.decoder.PrivateMessageDecoder; +import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; +import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; public class ChangePasswordRequestDecoder Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java Fri Feb 10 19:52:58 2006 @@ -17,7 +17,7 @@ package org.apache.directory.server.changepw.messages; -import org.apache.kerberos.messages.ErrorMessage; +import org.apache.directory.server.kerberos.shared.messages.ErrorMessage; public class ChangePasswordError extends AbstractPasswordMessage Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java Fri Feb 10 19:52:58 2006 @@ -17,7 +17,7 @@ package org.apache.directory.server.changepw.messages; -import org.apache.kerberos.messages.ErrorMessage; +import org.apache.directory.server.kerberos.shared.messages.ErrorMessage; public class ChangePasswordErrorModifier extends AbstractPasswordMessageModifier Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java Fri Feb 10 19:52:58 2006 @@ -17,8 +17,8 @@ package org.apache.directory.server.changepw.messages; -import org.apache.kerberos.messages.application.ApplicationReply; -import org.apache.kerberos.messages.application.PrivateMessage; +import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply; +import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; public class ChangePasswordReply extends AbstractPasswordMessage Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java Fri Feb 10 19:52:58 2006 @@ -17,8 +17,8 @@ package org.apache.directory.server.changepw.messages; -import org.apache.kerberos.messages.application.ApplicationReply; -import org.apache.kerberos.messages.application.PrivateMessage; +import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply; +import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; public class ChangePasswordReplyModifier extends AbstractPasswordMessageModifier Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java Fri Feb 10 19:52:58 2006 @@ -17,8 +17,8 @@ package org.apache.directory.server.changepw.messages; -import org.apache.kerberos.messages.ApplicationRequest; -import org.apache.kerberos.messages.application.PrivateMessage; +import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; +import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; public class ChangePasswordRequest extends AbstractPasswordMessage Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java Fri Feb 10 19:52:58 2006 @@ -17,8 +17,8 @@ package org.apache.directory.server.changepw.messages; -import org.apache.kerberos.messages.ApplicationRequest; -import org.apache.kerberos.messages.application.PrivateMessage; +import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; +import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; public class ChangePasswordRequestModifier extends AbstractPasswordMessageModifier Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java Fri Feb 10 19:52:58 2006 @@ -25,8 +25,8 @@ import org.apache.directory.server.changepw.messages.ChangePasswordRequest; import org.apache.directory.server.changepw.service.ChangePasswordChain; import org.apache.directory.server.changepw.service.ChangePasswordContext; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.server.protocol.shared.chain.Command; -import org.apache.kerberos.store.PrincipalStore; import org.apache.mina.common.IdleStatus; import org.apache.mina.common.IoHandler; import org.apache.mina.common.IoSession; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java Fri Feb 10 19:52:58 2006 @@ -22,21 +22,21 @@ import org.apache.directory.server.changepw.exceptions.ChangePasswordException; import org.apache.directory.server.changepw.exceptions.ErrorType; import org.apache.directory.server.changepw.messages.ChangePasswordReplyModifier; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; +import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply; +import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; +import org.apache.directory.server.kerberos.shared.messages.components.Authenticator; +import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPart; +import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPartModifier; +import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPart; +import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPartModifier; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; +import org.apache.directory.server.kerberos.shared.messages.value.HostAddress; +import org.apache.directory.server.kerberos.shared.service.LockBox; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.exceptions.KerberosException; -import org.apache.kerberos.messages.application.ApplicationReply; -import org.apache.kerberos.messages.application.PrivateMessage; -import org.apache.kerberos.messages.components.Authenticator; -import org.apache.kerberos.messages.components.EncApRepPart; -import org.apache.kerberos.messages.components.EncApRepPartModifier; -import org.apache.kerberos.messages.components.EncKrbPrivPart; -import org.apache.kerberos.messages.components.EncKrbPrivPartModifier; -import org.apache.kerberos.messages.components.Ticket; -import org.apache.kerberos.messages.value.EncryptedData; -import org.apache.kerberos.messages.value.EncryptionKey; -import org.apache.kerberos.messages.value.HostAddress; -import org.apache.kerberos.service.LockBox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java Fri Feb 10 19:52:58 2006 @@ -21,14 +21,14 @@ import org.apache.directory.server.changepw.ChangePasswordConfiguration; import org.apache.directory.server.changepw.messages.AbstractPasswordMessage; +import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; +import org.apache.directory.server.kerberos.shared.messages.components.Authenticator; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; +import org.apache.directory.server.kerberos.shared.replay.ReplayCache; +import org.apache.directory.server.kerberos.shared.service.LockBox; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; import org.apache.directory.server.protocol.shared.chain.impl.ContextBase; -import org.apache.kerberos.messages.ApplicationRequest; -import org.apache.kerberos.messages.components.Authenticator; -import org.apache.kerberos.messages.components.Ticket; -import org.apache.kerberos.replay.ReplayCache; -import org.apache.kerberos.service.LockBox; -import org.apache.kerberos.store.PrincipalStore; -import org.apache.kerberos.store.PrincipalStoreEntry; public class ChangePasswordContext extends ContextBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java Fri Feb 10 19:52:58 2006 @@ -24,14 +24,14 @@ import org.apache.directory.server.changepw.ChangePasswordConfiguration; import org.apache.directory.server.changepw.exceptions.ChangePasswordException; import org.apache.directory.server.changepw.messages.ChangePasswordErrorModifier; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; +import org.apache.directory.server.kerberos.shared.messages.ErrorMessage; +import org.apache.directory.server.kerberos.shared.messages.ErrorMessageModifier; +import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; import org.apache.directory.server.protocol.shared.chain.Command; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.Filter; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.exceptions.KerberosException; -import org.apache.kerberos.messages.ErrorMessage; -import org.apache.kerberos.messages.ErrorMessageModifier; -import org.apache.kerberos.messages.value.KerberosTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java Fri Feb 10 19:52:58 2006 @@ -26,9 +26,9 @@ import org.apache.directory.server.changepw.ChangePasswordConfiguration; import org.apache.directory.server.changepw.exceptions.ChangePasswordException; import org.apache.directory.server.changepw.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.messages.components.Authenticator; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.messages.components.Authenticator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java Fri Feb 10 19:52:58 2006 @@ -17,11 +17,11 @@ package org.apache.directory.server.changepw.service; +import org.apache.directory.server.kerberos.shared.replay.InMemoryReplayCache; +import org.apache.directory.server.kerberos.shared.replay.ReplayCache; +import org.apache.directory.server.kerberos.shared.service.LockBox; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.replay.InMemoryReplayCache; -import org.apache.kerberos.replay.ReplayCache; -import org.apache.kerberos.service.LockBox; public class ConfigureChangePasswordChain extends CommandBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java Fri Feb 10 19:52:58 2006 @@ -25,14 +25,14 @@ import org.apache.directory.server.changepw.messages.ChangePasswordRequest; import org.apache.directory.server.changepw.value.ChangePasswordData; import org.apache.directory.server.changepw.value.ChangePasswordDataModifier; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; +import org.apache.directory.server.kerberos.shared.messages.components.Authenticator; +import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPart; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; +import org.apache.directory.server.kerberos.shared.service.LockBox; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.exceptions.KerberosException; -import org.apache.kerberos.messages.components.Authenticator; -import org.apache.kerberos.messages.components.EncKrbPrivPart; -import org.apache.kerberos.messages.value.EncryptedData; -import org.apache.kerberos.messages.value.EncryptionKey; -import org.apache.kerberos.service.LockBox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java Fri Feb 10 19:52:58 2006 @@ -18,10 +18,10 @@ import org.apache.directory.server.changepw.messages.ChangePasswordRequest; +import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.messages.ApplicationRequest; -import org.apache.kerberos.messages.components.Ticket; /* Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java Fri Feb 10 19:52:58 2006 @@ -19,10 +19,10 @@ import javax.security.auth.kerberos.KerberosPrincipal; +import org.apache.directory.server.kerberos.shared.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.service.GetPrincipalStoreEntry; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.kerberos.exceptions.ErrorType; -import org.apache.kerberos.service.GetPrincipalStoreEntry; -import org.apache.kerberos.store.PrincipalStore; public class GetServerEntry extends GetPrincipalStoreEntry Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java Fri Feb 10 19:52:58 2006 @@ -21,16 +21,16 @@ import javax.security.auth.kerberos.KerberosPrincipal; +import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; +import org.apache.directory.server.kerberos.shared.messages.components.Authenticator; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; +import org.apache.directory.server.kerberos.shared.messages.value.HostAddress; +import org.apache.directory.server.kerberos.shared.messages.value.HostAddresses; +import org.apache.directory.server.kerberos.shared.replay.ReplayCache; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.messages.ApplicationRequest; -import org.apache.kerberos.messages.components.Authenticator; -import org.apache.kerberos.messages.components.Ticket; -import org.apache.kerberos.messages.value.HostAddress; -import org.apache.kerberos.messages.value.HostAddresses; -import org.apache.kerberos.replay.ReplayCache; -import org.apache.kerberos.store.PrincipalStore; -import org.apache.kerberos.store.PrincipalStoreEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java Fri Feb 10 19:52:58 2006 @@ -18,10 +18,10 @@ import org.apache.directory.server.changepw.messages.ChangePasswordReply; +import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply; +import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.messages.application.ApplicationReply; -import org.apache.kerberos.messages.application.PrivateMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java Fri Feb 10 19:52:58 2006 @@ -22,10 +22,10 @@ import org.apache.directory.server.changepw.exceptions.ChangePasswordException; import org.apache.directory.server.changepw.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.messages.components.Authenticator; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.messages.components.Authenticator; -import org.apache.kerberos.store.PrincipalStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java Fri Feb 10 19:52:58 2006 @@ -20,9 +20,9 @@ import javax.security.auth.kerberos.KerberosPrincipal; import org.apache.directory.server.changepw.ChangePasswordConfiguration; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; +import org.apache.directory.server.kerberos.shared.service.VerifyTicket; import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.kerberos.messages.components.Ticket; -import org.apache.kerberos.service.VerifyTicket; public class VerifyServiceTicket extends VerifyTicket Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicketAuthHeader.java Fri Feb 10 19:52:58 2006 @@ -19,14 +19,14 @@ import java.net.InetAddress; +import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; +import org.apache.directory.server.kerberos.shared.messages.components.Authenticator; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; +import org.apache.directory.server.kerberos.shared.replay.ReplayCache; +import org.apache.directory.server.kerberos.shared.service.LockBox; +import org.apache.directory.server.kerberos.shared.service.VerifyAuthHeader; import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.kerberos.messages.ApplicationRequest; -import org.apache.kerberos.messages.components.Authenticator; -import org.apache.kerberos.messages.components.Ticket; -import org.apache.kerberos.messages.value.EncryptionKey; -import org.apache.kerberos.replay.ReplayCache; -import org.apache.kerberos.service.LockBox; -import org.apache.kerberos.service.VerifyAuthHeader; public class VerifyServiceTicketAuthHeader extends VerifyAuthHeader Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordData.java Fri Feb 10 19:52:58 2006 @@ -17,7 +17,7 @@ package org.apache.directory.server.changepw.value; -import org.apache.kerberos.messages.value.PrincipalName; +import org.apache.directory.server.kerberos.shared.messages.value.PrincipalName; public class ChangePasswordData Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/value/ChangePasswordDataModifier.java Fri Feb 10 19:52:58 2006 @@ -17,7 +17,7 @@ package org.apache.directory.server.changepw.value; -import org.apache.kerberos.messages.value.PrincipalName; +import org.apache.directory.server.kerberos.shared.messages.value.PrincipalName; public class ChangePasswordDataModifier Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java Fri Feb 10 19:52:58 2006 @@ -29,9 +29,9 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.configuration.ConfigurationException; +import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType; import org.apache.directory.server.protocol.shared.LoadStrategy; import org.apache.directory.server.protocol.shared.ServiceConfiguration; -import org.apache.kerberos.crypto.encryption.EncryptionType; public class KdcConfiguration extends ServiceConfiguration Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java Fri Feb 10 19:52:58 2006 @@ -19,11 +19,11 @@ import java.net.InetAddress; +import org.apache.directory.server.kerberos.shared.messages.KdcRequest; +import org.apache.directory.server.kerberos.shared.messages.KerberosMessage; +import org.apache.directory.server.kerberos.shared.service.LockBox; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.server.protocol.shared.chain.impl.ContextBase; -import org.apache.kerberos.messages.KdcRequest; -import org.apache.kerberos.messages.KerberosMessage; -import org.apache.kerberos.service.LockBox; -import org.apache.kerberos.store.PrincipalStore; public class KdcContext extends ContextBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java Fri Feb 10 19:52:58 2006 @@ -22,7 +22,7 @@ import java.util.Dictionary; import org.apache.directory.server.kerberos.protocol.KerberosProtocolHandler; -import org.apache.kerberos.store.PrincipalStore; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.mina.common.IoHandler; import org.apache.mina.common.TransportType; import org.apache.mina.registry.Service; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java Fri Feb 10 19:52:58 2006 @@ -17,10 +17,10 @@ package org.apache.directory.server.kerberos.kdc; +import org.apache.directory.server.kerberos.shared.messages.ErrorMessage; +import org.apache.directory.server.kerberos.shared.messages.KdcReply; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.messages.ErrorMessage; -import org.apache.kerberos.messages.KdcReply; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java Fri Feb 10 19:52:58 2006 @@ -17,10 +17,10 @@ package org.apache.directory.server.kerberos.kdc; +import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType; +import org.apache.directory.server.kerberos.shared.messages.KdcRequest; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.crypto.encryption.EncryptionType; -import org.apache.kerberos.messages.KdcRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectChecksumType.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectChecksumType.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectChecksumType.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectChecksumType.java Fri Feb 10 19:52:58 2006 @@ -17,11 +17,11 @@ package org.apache.directory.server.kerberos.kdc; +import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumType; +import org.apache.directory.server.kerberos.shared.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.crypto.checksum.ChecksumType; -import org.apache.kerberos.exceptions.ErrorType; -import org.apache.kerberos.exceptions.KerberosException; public class SelectChecksumType extends CommandBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java Fri Feb 10 19:52:58 2006 @@ -17,11 +17,11 @@ package org.apache.directory.server.kerberos.kdc; +import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType; +import org.apache.directory.server.kerberos.shared.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.crypto.encryption.EncryptionType; -import org.apache.kerberos.exceptions.ErrorType; -import org.apache.kerberos.exceptions.KerberosException; public class SelectEncryptionType extends CommandBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java Fri Feb 10 19:52:58 2006 @@ -21,10 +21,10 @@ import java.util.Map; import org.apache.directory.server.kerberos.kdc.KdcContext; -import org.apache.kerberos.messages.components.Ticket; -import org.apache.kerberos.messages.value.EncryptionKey; -import org.apache.kerberos.replay.ReplayCache; -import org.apache.kerberos.store.PrincipalStoreEntry; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; +import org.apache.directory.server.kerberos.shared.replay.ReplayCache; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; public class AuthenticationContext extends KdcContext Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationExceptionHandler.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationExceptionHandler.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationExceptionHandler.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationExceptionHandler.java Fri Feb 10 19:52:58 2006 @@ -18,10 +18,10 @@ import org.apache.directory.server.kerberos.kdc.KdcConfiguration; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; +import org.apache.directory.server.kerberos.shared.messages.ErrorMessage; +import org.apache.directory.server.kerberos.shared.service.ErrorMessageHandler; import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.kerberos.exceptions.KerberosException; -import org.apache.kerberos.messages.ErrorMessage; -import org.apache.kerberos.service.ErrorMessageHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/BuildReply.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/BuildReply.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/BuildReply.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/BuildReply.java Fri Feb 10 19:52:58 2006 @@ -17,13 +17,13 @@ package org.apache.directory.server.kerberos.kdc.authentication; +import org.apache.directory.server.kerberos.shared.messages.AuthenticationReply; +import org.apache.directory.server.kerberos.shared.messages.KdcRequest; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; +import org.apache.directory.server.kerberos.shared.messages.value.LastRequest; +import org.apache.directory.server.kerberos.shared.messages.value.TicketFlags; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.messages.AuthenticationReply; -import org.apache.kerberos.messages.KdcRequest; -import org.apache.kerberos.messages.components.Ticket; -import org.apache.kerberos.messages.value.LastRequest; -import org.apache.kerberos.messages.value.TicketFlags; public class BuildReply extends CommandBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java Fri Feb 10 19:52:58 2006 @@ -19,16 +19,16 @@ import java.util.Map; +import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumType; +import org.apache.directory.server.kerberos.shared.crypto.checksum.Crc32Checksum; +import org.apache.directory.server.kerberos.shared.crypto.checksum.RsaMd4Checksum; +import org.apache.directory.server.kerberos.shared.crypto.checksum.RsaMd5Checksum; +import org.apache.directory.server.kerberos.shared.crypto.checksum.Sha1Checksum; +import org.apache.directory.server.kerberos.shared.replay.InMemoryReplayCache; +import org.apache.directory.server.kerberos.shared.replay.ReplayCache; +import org.apache.directory.server.kerberos.shared.service.LockBox; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.crypto.checksum.ChecksumType; -import org.apache.kerberos.crypto.checksum.Crc32Checksum; -import org.apache.kerberos.crypto.checksum.RsaMd4Checksum; -import org.apache.kerberos.crypto.checksum.RsaMd5Checksum; -import org.apache.kerberos.crypto.checksum.Sha1Checksum; -import org.apache.kerberos.replay.InMemoryReplayCache; -import org.apache.kerberos.replay.ReplayCache; -import org.apache.kerberos.service.LockBox; public class ConfigureAuthenticationChain extends CommandBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java Fri Feb 10 19:52:58 2006 @@ -20,21 +20,21 @@ import javax.security.auth.kerberos.KerberosPrincipal; import org.apache.directory.server.kerberos.kdc.KdcConfiguration; +import org.apache.directory.server.kerberos.shared.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; +import org.apache.directory.server.kerberos.shared.messages.KdcRequest; +import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPart; +import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier; +import org.apache.directory.server.kerberos.shared.messages.components.Ticket; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; +import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions; +import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; +import org.apache.directory.server.kerberos.shared.messages.value.TicketFlags; +import org.apache.directory.server.kerberos.shared.messages.value.TransitedEncoding; +import org.apache.directory.server.kerberos.shared.service.LockBox; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.exceptions.ErrorType; -import org.apache.kerberos.exceptions.KerberosException; -import org.apache.kerberos.messages.KdcRequest; -import org.apache.kerberos.messages.components.EncTicketPart; -import org.apache.kerberos.messages.components.EncTicketPartModifier; -import org.apache.kerberos.messages.components.Ticket; -import org.apache.kerberos.messages.value.EncryptedData; -import org.apache.kerberos.messages.value.EncryptionKey; -import org.apache.kerberos.messages.value.KdcOptions; -import org.apache.kerberos.messages.value.KerberosTime; -import org.apache.kerberos.messages.value.TicketFlags; -import org.apache.kerberos.messages.value.TransitedEncoding; -import org.apache.kerberos.service.LockBox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetClientEntry.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetClientEntry.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetClientEntry.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetClientEntry.java Fri Feb 10 19:52:58 2006 @@ -19,10 +19,10 @@ import javax.security.auth.kerberos.KerberosPrincipal; +import org.apache.directory.server.kerberos.shared.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.service.GetPrincipalStoreEntry; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.kerberos.exceptions.ErrorType; -import org.apache.kerberos.service.GetPrincipalStoreEntry; -import org.apache.kerberos.store.PrincipalStore; public class GetClientEntry extends GetPrincipalStoreEntry Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetServerEntry.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetServerEntry.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetServerEntry.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetServerEntry.java Fri Feb 10 19:52:58 2006 @@ -19,10 +19,10 @@ import javax.security.auth.kerberos.KerberosPrincipal; +import org.apache.directory.server.kerberos.shared.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.service.GetPrincipalStoreEntry; +import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.kerberos.exceptions.ErrorType; -import org.apache.kerberos.service.GetPrincipalStoreEntry; -import org.apache.kerberos.store.PrincipalStore; public class GetServerEntry extends GetPrincipalStoreEntry Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetSessionKey.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetSessionKey.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetSessionKey.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetSessionKey.java Fri Feb 10 19:52:58 2006 @@ -19,10 +19,10 @@ import java.security.SecureRandom; +import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; +import org.apache.directory.server.kerberos.shared.service.DesStringToKey; import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.kerberos.crypto.encryption.EncryptionType; -import org.apache.kerberos.messages.value.EncryptionKey; -import org.apache.kerberos.service.DesStringToKey; public class GetSessionKey extends DesStringToKey Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/SealReply.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/SealReply.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/SealReply.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/SealReply.java Fri Feb 10 19:52:58 2006 @@ -17,12 +17,12 @@ package org.apache.directory.server.kerberos.kdc.authentication; +import org.apache.directory.server.kerberos.shared.messages.AuthenticationReply; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; +import org.apache.directory.server.kerberos.shared.service.LockBox; import org.apache.directory.server.protocol.shared.chain.Context; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.messages.AuthenticationReply; -import org.apache.kerberos.messages.value.EncryptedData; -import org.apache.kerberos.messages.value.EncryptionKey; -import org.apache.kerberos.service.LockBox; public class SealReply extends CommandBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifierBase.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifierBase.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifierBase.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifierBase.java Fri Feb 10 19:52:58 2006 @@ -19,14 +19,14 @@ import java.io.IOException; +import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType; +import org.apache.directory.server.kerberos.shared.io.encoder.EncryptionTypeInfoEncoder; +import org.apache.directory.server.kerberos.shared.io.encoder.PreAuthenticationDataEncoder; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionTypeInfoEntry; +import org.apache.directory.server.kerberos.shared.messages.value.PreAuthenticationData; +import org.apache.directory.server.kerberos.shared.messages.value.PreAuthenticationDataModifier; +import org.apache.directory.server.kerberos.shared.messages.value.PreAuthenticationDataType; import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; -import org.apache.kerberos.crypto.encryption.EncryptionType; -import org.apache.kerberos.io.encoder.EncryptionTypeInfoEncoder; -import org.apache.kerberos.io.encoder.PreAuthenticationDataEncoder; -import org.apache.kerberos.messages.value.EncryptionTypeInfoEntry; -import org.apache.kerberos.messages.value.PreAuthenticationData; -import org.apache.kerberos.messages.value.PreAuthenticationDataModifier; -import org.apache.kerberos.messages.value.PreAuthenticationDataType; public abstract class VerifierBase extends CommandBase Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java?rev=376922&r1=376921&r2=376922&view=diff ============================================================================== --- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java (original) +++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java Fri Feb 10 19:52:58 2006 @@ -21,18 +21,18 @@ import org.apache.directory.server.kerberos.kdc.KdcConfiguration; import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationContext; +import org.apache.directory.server.kerberos.shared.exceptions.ErrorType; +import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; +import org.apache.directory.server.kerberos.shared.io.decoder.EncryptedDataDecoder; +import org.apache.directory.server.kerberos.shared.messages.KdcRequest; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp; +import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey; +import org.apache.directory.server.kerberos.shared.messages.value.PreAuthenticationData; +import org.apache.directory.server.kerberos.shared.messages.value.PreAuthenticationDataType; +import org.apache.directory.server.kerberos.shared.service.LockBox; +import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.kerberos.exceptions.ErrorType; -import org.apache.kerberos.exceptions.KerberosException; -import org.apache.kerberos.io.decoder.EncryptedDataDecoder; -import org.apache.kerberos.messages.KdcRequest; -import org.apache.kerberos.messages.value.EncryptedData; -import org.apache.kerberos.messages.value.EncryptedTimeStamp; -import org.apache.kerberos.messages.value.EncryptionKey; -import org.apache.kerberos.messages.value.PreAuthenticationData; -import org.apache.kerberos.messages.value.PreAuthenticationDataType; -import org.apache.kerberos.service.LockBox; -import org.apache.kerberos.store.PrincipalStoreEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory;