Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 64319 invoked from network); 3 Dec 2010 00:20:25 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Dec 2010 00:20:25 -0000 Received: (qmail 3167 invoked by uid 500); 3 Dec 2010 00:20:25 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 3108 invoked by uid 500); 3 Dec 2010 00:20:25 -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 3099 invoked by uid 99); 3 Dec 2010 00:20:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Dec 2010 00:20:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Dec 2010 00:20:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3BAAB23889B3; Fri, 3 Dec 2010 00:18:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1041655 - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0: kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/i... Date: Fri, 03 Dec 2010 00:18:44 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101203001845.3BAAB23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Fri Dec 3 00:18:43 2010 New Revision: 1041655 URL: http://svn.apache.org/viewvc?rev=1041655&view=rev Log: o Removed the Ticket class and replaced it by the kerberos-codec one o Various fixes Removed: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/Ticket.java Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcReplyDecoder.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/TicketDecoder.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/ApplicationRequest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/AuthenticationReply.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcReply.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/TicketGrantReply.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/application/CredentialMessage.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBody.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBodyModifier.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java Fri Dec 3 00:18:43 2010 @@ -48,6 +48,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.EncTicketPart; import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.EncryptionKey; +import org.apache.directory.shared.kerberos.components.PaEncTsEnc; import org.apache.directory.shared.kerberos.messages.Authenticator; @@ -72,7 +73,7 @@ public class CipherTextHandler map.put( EncTicketPart.class, EncTicketPartDecoder.class ); map.put( Authenticator.class, AuthenticatorDecoder.class ); - map.put( PaEncTsEncÊ.class, EncryptedTimestampDecoder.class ); + map.put( PaEncTsEnc.class, EncryptedTimestampDecoder.class ); map.put( AuthorizationData.class, AuthorizationDataDecoder.class ); map.put( EncKrbPrivPart.class, EncKrbPrivPartDecoder.class ); map.put( EncApRepPart.class, EncApRepPartDecoder.class ); Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcReplyDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcReplyDecoder.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcReplyDecoder.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcReplyDecoder.java Fri Dec 3 00:18:43 2010 @@ -27,7 +27,6 @@ import java.util.Enumeration; import javax.security.auth.kerberos.KerberosPrincipal; import org.apache.directory.server.kerberos.shared.messages.KdcReply; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.server.kerberos.shared.messages.value.KerberosPrincipalModifier; import org.apache.directory.shared.asn1.der.ASN1InputStream; import org.apache.directory.shared.asn1.der.DERApplicationSpecific; @@ -39,6 +38,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.kerberos.KerberosMessageType; import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.PaData; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/TicketDecoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/TicketDecoder.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/TicketDecoder.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/TicketDecoder.java Fri Dec 3 00:18:43 2010 @@ -23,7 +23,6 @@ package org.apache.directory.server.kerb import java.io.IOException; import java.util.Enumeration; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.shared.asn1.der.ASN1InputStream; import org.apache.directory.shared.asn1.der.DERApplicationSpecific; import org.apache.directory.shared.asn1.der.DEREncodable; @@ -31,6 +30,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.der.DERInteger; import org.apache.directory.shared.asn1.der.DERSequence; import org.apache.directory.shared.asn1.der.DERTaggedObject; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/ApplicationRequest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/ApplicationRequest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/ApplicationRequest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/ApplicationRequest.java Fri Dec 3 00:18:43 2010 @@ -20,10 +20,10 @@ package org.apache.directory.server.kerberos.shared.messages; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.server.kerberos.shared.messages.value.ApOptions; -import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.KerberosMessageType; +import org.apache.directory.shared.kerberos.components.EncryptedData; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/AuthenticationReply.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/AuthenticationReply.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/AuthenticationReply.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/AuthenticationReply.java Fri Dec 3 00:18:43 2010 @@ -22,10 +22,10 @@ package org.apache.directory.server.kerb import javax.security.auth.kerberos.KerberosPrincipal; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.shared.kerberos.KerberosMessageType; import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.PaData; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcReply.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcReply.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcReply.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcReply.java Fri Dec 3 00:18:43 2010 @@ -23,7 +23,6 @@ package org.apache.directory.server.kerb import javax.security.auth.kerberos.KerberosPrincipal; import org.apache.directory.server.kerberos.shared.messages.components.EncKdcRepPart; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlags; import org.apache.directory.shared.kerberos.KerberosMessageType; import org.apache.directory.shared.kerberos.KerberosTime; @@ -32,6 +31,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.HostAddresses; import org.apache.directory.shared.kerberos.components.LastReq; import org.apache.directory.shared.kerberos.components.PaData; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcRequest.java Fri Dec 3 00:18:43 2010 @@ -24,7 +24,6 @@ import java.util.Set; import javax.security.auth.kerberos.KerberosPrincipal; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions; import org.apache.directory.server.kerberos.shared.messages.value.RequestBody; import org.apache.directory.shared.kerberos.KerberosMessageType; @@ -33,6 +32,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.HostAddresses; import org.apache.directory.shared.kerberos.components.PaData; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/TicketGrantReply.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/TicketGrantReply.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/TicketGrantReply.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/TicketGrantReply.java Fri Dec 3 00:18:43 2010 @@ -22,10 +22,10 @@ package org.apache.directory.server.kerb import javax.security.auth.kerberos.KerberosPrincipal; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.shared.kerberos.KerberosMessageType; import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.PaData; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/application/CredentialMessage.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/application/CredentialMessage.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/application/CredentialMessage.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/application/CredentialMessage.java Fri Dec 3 00:18:43 2010 @@ -21,9 +21,9 @@ package org.apache.directory.server.kerb import org.apache.directory.server.kerberos.shared.messages.KerberosMessage; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; -import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.KerberosMessageType; +import org.apache.directory.shared.kerberos.components.EncryptedData; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBody.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBody.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBody.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBody.java Fri Dec 3 00:18:43 2010 @@ -24,11 +24,11 @@ import java.util.Set; import javax.security.auth.kerberos.KerberosPrincipal; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.HostAddresses; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBodyModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBodyModifier.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBodyModifier.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/RequestBodyModifier.java Fri Dec 3 00:18:43 2010 @@ -24,12 +24,12 @@ import java.util.Set; import javax.security.auth.kerberos.KerberosPrincipal; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.HostAddresses; import org.apache.directory.shared.kerberos.components.PrincipalName; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java Fri Dec 3 00:18:43 2010 @@ -34,7 +34,6 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory; import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; 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.flags.TicketFlag; import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlags; import org.apache.directory.shared.kerberos.KerberosTime; @@ -43,6 +42,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.EncryptionKey; import org.apache.directory.shared.kerberos.components.TransitedEncoding; +import org.apache.directory.shared.kerberos.messages.Ticket; /** @@ -119,10 +119,10 @@ public class TicketFactory Ticket ticket = new Ticket(); ticket.setTktVno( KerberosConstants.KERBEROS_V5 ); - ticket.setServerPrincipal( serverPrincipal ); + ticket.setSName( serverPrincipal ); ticket.setEncPart( encryptedTicketPart ); - ticket.setEncTicketPart( encTicketPart ); + ticket.setEncPart( encTicketPart ); return ticket; } @@ -137,7 +137,8 @@ public class TicketFactory */ public KerberosTicket getKerberosTicket( Ticket ticket ) throws IOException { - byte[] asn1Encoding = TicketEncoder.encodeTicket( ticket ); + + byte[] asn1Encoding = ticket.encode( null ).array(); KerberosPrincipal client = ticket.getEncTicketPart().getClientPrincipal(); KerberosPrincipal server = ticket.getServerPrincipal(); Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Fri Dec 3 00:18:43 2010 @@ -19,6 +19,8 @@ */ package org.apache.directory.server.kerberos.shared.store.operations; +import java.nio.ByteBuffer; + import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.core.filtering.EntryFilteringCursor; import org.apache.directory.server.i18n.I18n; @@ -80,7 +82,9 @@ public class StoreUtils outAttrs.add( SchemaConstants.CN_AT, principalEntry.getCommonName() ); EncryptionKey encryptionKey = principalEntry.getKeyMap().get( EncryptionType.DES_CBC_MD5 ); - outAttrs.add( KerberosAttribute.KRB5_KEY_AT, EncryptionKeyEncoder.encode( encryptionKey ) ); + + ByteBuffer buffer = ByteBuffer.allocate( encryptionKey.computeLength() ); + outAttrs.add( KerberosAttribute.KRB5_KEY_AT, encryptionKey.encode( buffer ).array() ); int keyVersion = encryptionKey.getKeyVersion(); Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java Fri Dec 3 00:18:43 2010 @@ -147,8 +147,8 @@ public class CipherTextHandlerTest try { PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data, KeyUsage.NUMBER1 ); - assertEquals( "TimeStamp", "20070322233107Z", object.getTimeStamp().toString() ); - assertEquals( "MicroSeconds", 291067, object.getMicroSeconds() ); + assertEquals( "TimeStamp", "20070322233107Z", object.getPaTimestamp().toString() ); + assertEquals( "MicroSeconds", 291067, object.getPausec() ); } catch ( KerberosException ke ) { @@ -202,8 +202,8 @@ public class CipherTextHandlerTest try { PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data, KeyUsage.NUMBER1 ); - assertEquals( "TimeStamp", "20070410190400Z", object.getTimeStamp().toString() ); - assertEquals( "MicroSeconds", 460450, object.getMicroSeconds() ); + assertEquals( "TimeStamp", "20070410190400Z", object.getPaTimestamp().toString() ); + assertEquals( "MicroSeconds", 460450, object.getPausec() ); } catch ( KerberosException ke ) { @@ -249,8 +249,8 @@ public class CipherTextHandlerTest { PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, encryptedData, KeyUsage.NUMBER1 ); - assertEquals( "TimeStamp", zuluTime, object.getTimeStamp().toString() ); - assertEquals( "MicroSeconds", microSeconds, object.getMicroSeconds() ); + assertEquals( "TimeStamp", zuluTime, object.getPaTimestamp().toString() ); + assertEquals( "MicroSeconds", microSeconds, object.getPausec() ); } catch ( KerberosException ke ) { @@ -282,8 +282,8 @@ public class CipherTextHandlerTest try { PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data, KeyUsage.NUMBER1 ); - assertEquals( "TimeStamp", "20070410212557Z", object.getTimeStamp().toString() ); - assertEquals( "MicroSeconds", 379386, object.getMicroSeconds() ); + assertEquals( "TimeStamp", "20070410212557Z", object.getPaTimestamp().toString() ); + assertEquals( "MicroSeconds", 379386, object.getPausec() ); } catch ( KerberosException ke ) { @@ -333,8 +333,8 @@ public class CipherTextHandlerTest { PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, encryptedData, KeyUsage.NUMBER1 ); - assertEquals( "TimeStamp", "20070410190400Z", object.getTimeStamp().toString() ); - assertEquals( "MicroSeconds", 460450, object.getMicroSeconds() ); + assertEquals( "TimeStamp", "20070410190400Z", object.getPaTimestamp().toString() ); + assertEquals( "MicroSeconds", 460450, object.getPausec() ); } catch ( KerberosException ke ) { @@ -378,8 +378,8 @@ public class CipherTextHandlerTest try { PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data, KeyUsage.NUMBER1 ); - assertEquals( "TimeStamp", "20070410212809Z", object.getTimeStamp().toString() ); - assertEquals( "MicroSeconds", 298294, object.getMicroSeconds() ); + assertEquals( "TimeStamp", "20070410212809Z", object.getPaTimestamp().toString() ); + assertEquals( "MicroSeconds", 298294, object.getPausec() ); } catch ( KerberosException ke ) { @@ -441,8 +441,8 @@ public class CipherTextHandlerTest { PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, encryptedData, KeyUsage.NUMBER1 ); - assertEquals( "TimeStamp", "20070410190400Z", object.getTimeStamp().toString() ); - assertEquals( "MicroSeconds", 460450, object.getMicroSeconds() ); + assertEquals( "TimeStamp", "20070410190400Z", object.getPaTimestamp().toString() ); + assertEquals( "MicroSeconds", 460450, object.getPausec() ); } catch ( KerberosException ke ) { @@ -478,7 +478,7 @@ public class CipherTextHandlerTest { PaEncTsEnc object = ( PaEncTsEnc ) lockBox.unseal( hint, key, data ); assertEquals( "TimeStamp", "20070322233107Z", object.getTimeStamp().toString() ); - assertEquals( "MicroSeconds", 291067, object.getMicroSeconds() ); + assertEquals( "MicroSeconds", 291067, object.getPausec() ); } catch ( KerberosException ke ) { Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java Fri Dec 3 00:18:43 2010 @@ -20,10 +20,6 @@ package org.apache.directory.server.kerberos.shared.messages.components; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.nio.ByteBuffer; -import java.util.Arrays; import javax.security.auth.kerberos.KerberosPrincipal; @@ -31,6 +27,7 @@ import org.apache.directory.junit.tools. import org.apache.directory.junit.tools.ConcurrentJunitRunner; import org.apache.directory.server.kerberos.shared.store.TicketFactory; import org.apache.directory.shared.kerberos.components.EncryptionKey; +import org.apache.directory.shared.kerberos.messages.Ticket; import org.apache.directory.shared.ldap.util.StringTools; import org.junit.Ignore; import org.junit.Test; @@ -59,9 +56,7 @@ public class TicketTest Ticket serviceTicket = ticketFactory.getTicket( clientPrincipal, serverPrincipal, serverKey ); - byte[] encodedTicket = TicketEncoder.encodeTicket( serviceTicket ); - - ByteBuffer encoded = serviceTicket.encode(); + byte[] encodedTicket = serviceTicket.encode( null ).array(); byte[] expectedResult = new byte[] { @@ -92,10 +87,9 @@ public class TicketTest // We will just compared the first bytes (everything before the encrypted data) String expectedResultString = StringTools.dumpBytes( expectedResult ); - String resultString = StringTools.dumpBytes( encoded.array() ).substring( 0, expectedResultString.length() ); + String resultString = StringTools.dumpBytes( encodedTicket ).substring( 0, expectedResultString.length() ); assertEquals( expectedResultString, resultString ); - assertTrue( Arrays.equals( encodedTicket, encodedTicket ) ); } /* Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java Fri Dec 3 00:18:43 2010 @@ -26,11 +26,11 @@ import org.apache.directory.server.chang import org.apache.directory.server.changepw.messages.AbstractPasswordMessage; import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler; import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; -import org.apache.directory.shared.kerberos.messages.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.store.PrincipalStore; import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; +import org.apache.directory.shared.kerberos.messages.Authenticator; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java Fri Dec 3 00:18:43 2010 @@ -47,9 +47,6 @@ import org.apache.directory.server.kerbe 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.shared.kerberos.components.HostAddress; -import org.apache.directory.shared.kerberos.components.HostAddresses; 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.store.PrincipalStore; @@ -58,7 +55,10 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.EncryptionKey; +import org.apache.directory.shared.kerberos.components.HostAddress; +import org.apache.directory.shared.kerberos.components.HostAddresses; import org.apache.directory.shared.kerberos.messages.Authenticator; +import org.apache.directory.shared.kerberos.messages.Ticket; import org.apache.mina.core.session.IoSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java Fri Dec 3 00:18:43 2010 @@ -48,9 +48,7 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage; 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.ApOptions; -import org.apache.directory.shared.kerberos.components.HostAddress; import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.server.kerberos.shared.store.TicketFactory; import org.apache.directory.shared.kerberos.KerberosMessageType; @@ -59,8 +57,10 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.codec.types.PrincipalNameType; import org.apache.directory.shared.kerberos.components.EncryptedData; import org.apache.directory.shared.kerberos.components.EncryptionKey; +import org.apache.directory.shared.kerberos.components.HostAddress; import org.apache.directory.shared.kerberos.components.PrincipalName; import org.apache.directory.shared.kerberos.messages.Authenticator; +import org.apache.directory.shared.kerberos.messages.Ticket; import org.apache.mina.core.future.WriteFuture; import org.apache.mina.core.session.DummySession; import org.junit.BeforeClass; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java Fri Dec 3 00:18:43 2010 @@ -21,10 +21,10 @@ package org.apache.directory.server.kerb import org.apache.directory.server.kerberos.kdc.KdcContext; -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.store.PrincipalStoreEntry; import org.apache.directory.shared.kerberos.components.EncryptionKey; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java Fri Dec 3 00:18:43 2010 @@ -22,10 +22,10 @@ package org.apache.directory.server.kerb import org.apache.directory.server.kerberos.kdc.KdcContext; import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; -import org.apache.directory.shared.kerberos.messages.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.store.PrincipalStoreEntry; +import org.apache.directory.shared.kerberos.messages.Authenticator; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java Fri Dec 3 00:18:43 2010 @@ -44,7 +44,6 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.KdcRequest; import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply; 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.KdcOptions; import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlag; import org.apache.directory.server.kerberos.shared.replay.InMemoryReplayCache; @@ -67,6 +66,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.PaData; import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType; import org.apache.directory.shared.kerberos.messages.Authenticator; +import org.apache.directory.shared.kerberos.messages.Ticket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java Fri Dec 3 00:18:43 2010 @@ -35,7 +35,6 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; import org.apache.directory.server.kerberos.shared.messages.KdcRequest; 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.ApOptions; import org.apache.directory.server.kerberos.shared.messages.value.RequestBody; import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlag; @@ -54,6 +53,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.TransitedEncoding; import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType; import org.apache.directory.shared.kerberos.messages.Authenticator; +import org.apache.directory.shared.kerberos.messages.Ticket; /** Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java Fri Dec 3 00:18:43 2010 @@ -30,13 +30,13 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.ErrorMessage; import org.apache.directory.server.kerberos.shared.messages.KdcRequest; 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.KdcOptions; import org.apache.directory.server.kerberos.shared.messages.value.RequestBody; import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier; import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.components.EncryptionKey; +import org.apache.directory.shared.kerberos.messages.Ticket; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java Fri Dec 3 00:18:43 2010 @@ -36,7 +36,6 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.KdcRequest; import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply; 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.KdcOptions; import org.apache.directory.server.kerberos.shared.messages.value.RequestBody; import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier; @@ -44,6 +43,7 @@ import org.apache.directory.server.kerbe import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.EncryptionKey; +import org.apache.directory.shared.kerberos.messages.Ticket; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java Fri Dec 3 00:18:43 2010 @@ -33,9 +33,6 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.ErrorMessage; import org.apache.directory.server.kerberos.shared.messages.KdcRequest; import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier; -import org.apache.directory.server.kerberos.shared.messages.components.Ticket; -import org.apache.directory.shared.kerberos.components.HostAddress; -import org.apache.directory.shared.kerberos.components.HostAddresses; import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions; import org.apache.directory.server.kerberos.shared.messages.value.RequestBody; import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier; @@ -43,6 +40,9 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.components.EncryptionKey; +import org.apache.directory.shared.kerberos.components.HostAddress; +import org.apache.directory.shared.kerberos.components.HostAddresses; +import org.apache.directory.shared.kerberos.messages.Ticket; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java?rev=1041655&r1=1041654&r2=1041655&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java Fri Dec 3 00:18:43 2010 @@ -40,7 +40,6 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.KdcRequest; import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply; 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.KdcOptions; import org.apache.directory.server.kerberos.shared.messages.value.RequestBody; import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier; @@ -53,6 +52,7 @@ import org.apache.directory.shared.kerbe import org.apache.directory.shared.kerberos.components.HostAddress; import org.apache.directory.shared.kerberos.components.HostAddresses; import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType; +import org.apache.directory.shared.kerberos.messages.Ticket; import org.junit.After; import org.junit.Before; import org.junit.Test;