From commits-return-29033-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Dec 02 09:07:53 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 26512 invoked from network); 2 Dec 2010 09:07:52 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Dec 2010 09:07:52 -0000 Received: (qmail 26064 invoked by uid 500); 2 Dec 2010 09:07:52 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 26007 invoked by uid 500); 2 Dec 2010 09:07:51 -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 25998 invoked by uid 99); 2 Dec 2010 09:07:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Dec 2010 09:07:51 +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; Thu, 02 Dec 2010 09:07:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D5DF82388A39; Thu, 2 Dec 2010 09:06:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1041312 [2/2] - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0: kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/ kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/ kerberos-shared/src/... Date: Thu, 02 Dec 2010 09:06:16 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101202090617.D5DF82388A39@eris.apache.org> 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=1041312&r1=1041311&r2=1041312&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 Thu Dec 2 09:06:13 2010 @@ -24,7 +24,6 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Set; import javax.security.auth.kerberos.KerberosPrincipal; @@ -55,7 +54,6 @@ import org.apache.directory.server.kerbe 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.messages.value.KdcOptions; -import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; import org.apache.directory.server.kerberos.shared.messages.value.LastRequest; import org.apache.directory.server.kerberos.shared.messages.value.PaData; import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlag; @@ -64,6 +62,7 @@ import org.apache.directory.server.kerbe 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.KerberosTime; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.EncryptionKey; import org.apache.directory.shared.kerberos.components.KdcReq; @@ -145,16 +144,16 @@ public class TicketGrantingService sb.append( "\n\t" + "messageType: " + request.getMessageType() ); sb.append( "\n\t" + "protocolVersionNumber: " + request.getProtocolVersionNumber() ); sb.append( "\n\t" + "clientAddress: " + clientAddress ); - sb.append( "\n\t" + "nonce: " + request.getNonce() ); - sb.append( "\n\t" + "kdcOptions: " + request.getKdcOptions() ); + sb.append( "\n\t" + "nonce: " + request.getKdcReqBody().getNonce() ); + sb.append( "\n\t" + "kdcOptions: " + request.getKdcReqBody().getKdcOptions() ); sb.append( "\n\t" + "clientPrincipal: " + request.getClientPrincipal() ); sb.append( "\n\t" + "serverPrincipal: " + request.getServerPrincipal() ); - sb.append( "\n\t" + "encryptionType: " + KerberosUtils.getEncryptionTypesString( request.getEType() ) ); - sb.append( "\n\t" + "realm: " + request.getRealm() ); - sb.append( "\n\t" + "from time: " + request.getFrom() ); - sb.append( "\n\t" + "till time: " + request.getTill() ); - sb.append( "\n\t" + "renew-till time: " + request.getRtime() ); - sb.append( "\n\t" + "hostAddresses: " + request.getAddresses() ); + sb.append( "\n\t" + "encryptionType: " + KerberosUtils.getEncryptionTypesString( request.getKdcReqBody().getEType() ) ); + sb.append( "\n\t" + "realm: " + request.getKdcReqBody().getRealm() ); + sb.append( "\n\t" + "from time: " + request.getKdcReqBody().getFrom() ); + sb.append( "\n\t" + "till time: " + request.getKdcReqBody().getTill() ); + sb.append( "\n\t" + "renew-till time: " + request.getKdcReqBody().getRTime() ); + sb.append( "\n\t" + "hostAddresses: " + request.getKdcReqBody().getAddresses() ); LOG.debug( sb.toString() ); } @@ -171,7 +170,7 @@ public class TicketGrantingService KdcContext kdcContext = (KdcContext)tgsContext; KdcServer config = kdcContext.getConfig(); - Set requestedTypes = kdcContext.getRequest().getEType(); + List requestedTypes = kdcContext.getRequest().getKdcReqBody().getEType(); EncryptionType bestType = KerberosUtils.getBestEncryptionType( requestedTypes, config.getEncryptionTypes() ); @@ -188,9 +187,9 @@ public class TicketGrantingService private static void getAuthHeader( TicketGrantingContext tgsContext ) throws Exception { - KdcRequest request = tgsContext.getRequest(); + KdcReq request = tgsContext.getRequest(); - PaData[] preAuthData = request.getPreAuthData(); + PaData[] preAuthData = request.getPaData(); if ( preAuthData == null || preAuthData.length < 1 ) { @@ -263,7 +262,7 @@ public class TicketGrantingService ApplicationRequest authHeader = tgsContext.getAuthHeader(); Ticket tgt = tgsContext.getTgt(); - boolean isValidate = tgsContext.getRequest().getKdcOptions().get( KdcOptions.VALIDATE ); + boolean isValidate = tgsContext.getRequest().getKdcReqBody().getKdcOptions().get( KdcOptions.VALIDATE ); EncryptionType encryptionType = tgt.getEncPart().getEType(); EncryptionKey serverKey = tgsContext.getTicketPrincipalEntry().getKeyMap().get( encryptionType ); @@ -315,7 +314,7 @@ public class TicketGrantingService private static void generateTicket( TicketGrantingContext tgsContext ) throws KerberosException { - KdcRequest request = tgsContext.getRequest(); + KdcReq request = tgsContext.getRequest(); Ticket tgt = tgsContext.getTgt(); Authenticator authenticator = tgsContext.getAuthenticator(); CipherTextHandler cipherTextHandler = tgsContext.getCipherTextHandler(); @@ -351,7 +350,7 @@ public class TicketGrantingService EncTicketPart ticketPart = newTicketBody.getEncTicketPart(); - if ( request.getOption( KdcOptions.ENC_TKT_IN_SKEY ) ) + if ( request.getKdcReqBody().getKdcOptions().get( KdcOptions.ENC_TKT_IN_SKEY ) ) { /* * if (server not specified) then @@ -381,7 +380,7 @@ public class TicketGrantingService private static void buildReply( TicketGrantingContext tgsContext ) throws KerberosException { - KdcRequest request = tgsContext.getRequest(); + KdcReq request = tgsContext.getRequest(); Ticket tgt = tgsContext.getTgt(); Ticket newTicket = tgsContext.getNewTicket(); @@ -389,7 +388,7 @@ public class TicketGrantingService reply.setClientPrincipal( tgt.getEncTicketPart().getClientPrincipal() ); reply.setTicket( newTicket ); reply.setKey( newTicket.getEncTicketPart().getSessionKey() ); - reply.setNonce( request.getNonce() ); + reply.setNonce( request.getKdcReqBody().getNonce() ); // TODO - resp.last-req := fetch_last_request_info(client); requires store reply.setLastRequest( new LastRequest() ); reply.setFlags( newTicket.getEncTicketPart().getFlags() ); Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.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/protocol/KerberosProtocolHandler.java?rev=1041312&r1=1041311&r2=1041312&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java Thu Dec 2 09:06:13 2010 @@ -35,9 +35,9 @@ import org.apache.directory.server.kerbe 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.kerberos.shared.store.PrincipalStore; import org.apache.directory.shared.kerberos.KerberosMessageType; +import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.components.KdcReq; import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.session.IdleStatus; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.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/sam/TimestampChecker.java?rev=1041312&r1=1041311&r2=1041312&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java Thu Dec 2 09:06:13 2010 @@ -30,7 +30,7 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.io.decoder.EncryptedDataDecoder; 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.KerberosTime; +import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.EncryptionKey; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.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/AbstractAuthenticationServiceTest.java?rev=1041312&r1=1041311&r2=1041312&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractAuthenticationServiceTest.java Thu Dec 2 09:06:13 2010 @@ -32,11 +32,11 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.io.encoder.EncryptedDataEncoder; 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.KerberosTime; import org.apache.directory.server.kerberos.shared.messages.value.PaData; import org.apache.directory.server.kerberos.shared.messages.value.PrincipalName; import org.apache.directory.server.kerberos.shared.messages.value.types.PaDataType; import org.apache.directory.server.kerberos.shared.messages.value.types.PrincipalNameType; +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.mina.core.future.WriteFuture; 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=1041312&r1=1041311&r2=1041312&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 Thu Dec 2 09:06:13 2010 @@ -45,7 +45,6 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.value.ApOptions; import org.apache.directory.server.kerberos.shared.messages.value.Checksum; import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData; -import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; import org.apache.directory.server.kerberos.shared.messages.value.PaData; import org.apache.directory.server.kerberos.shared.messages.value.PrincipalName; import org.apache.directory.server.kerberos.shared.messages.value.RequestBody; @@ -55,6 +54,7 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.messages.value.types.PaDataType; import org.apache.directory.server.kerberos.shared.messages.value.types.PrincipalNameType; import org.apache.directory.shared.kerberos.KerberosMessageType; +import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.EncryptionKey; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.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/AuthenticationEncryptionTypeTest.java?rev=1041312&r1=1041311&r2=1041312&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java Thu Dec 2 09:06:13 2010 @@ -41,12 +41,12 @@ import org.apache.directory.server.kerbe 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.KdcOptions; -import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; import org.apache.directory.server.kerberos.shared.messages.value.PaData; import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier; import org.apache.directory.server.kerberos.shared.messages.value.types.PaDataType; import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.shared.kerberos.KerberosMessageType; +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.junit.After; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.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/AuthenticationPolicyTest.java?rev=1041312&r1=1041311&r2=1041312&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java Thu Dec 2 09:06:13 2010 @@ -27,10 +27,10 @@ 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.value.KdcOptions; -import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; 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.KerberosMessageType; +import org.apache.directory.shared.kerberos.KerberosTime; 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/AuthenticationServiceTest.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/AuthenticationServiceTest.java?rev=1041312&r1=1041311&r2=1041312&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java Thu Dec 2 09:06:13 2010 @@ -35,11 +35,11 @@ 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.value.KdcOptions; -import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; import org.apache.directory.server.kerberos.shared.messages.value.PaData; 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.KerberosMessageType; +import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.junit.After; import org.junit.Before; 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=1041312&r1=1041311&r2=1041312&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 Thu Dec 2 09:06:13 2010 @@ -32,10 +32,10 @@ import org.apache.directory.server.kerbe 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.KerberosTime; 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.junit.After; import org.junit.Before; Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.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/PreAuthenticationTest.java?rev=1041312&r1=1041311&r2=1041312&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java Thu Dec 2 09:06:13 2010 @@ -33,12 +33,12 @@ import org.apache.directory.server.kerbe 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.KdcOptions; -import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; import org.apache.directory.server.kerberos.shared.messages.value.PaData; import org.apache.directory.server.kerberos.shared.messages.value.RequestBodyModifier; import org.apache.directory.server.kerberos.shared.messages.value.types.PaDataType; import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.shared.kerberos.KerberosMessageType; +import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.components.EncryptionKey; import org.junit.After; import org.junit.Before; 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=1041312&r1=1041311&r2=1041312&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 Thu Dec 2 09:06:13 2010 @@ -38,10 +38,10 @@ import org.apache.directory.server.kerbe 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.KerberosTime; 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.codec.types.EncryptionType; import org.apache.directory.shared.kerberos.components.EncryptionKey; import org.junit.After; 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=1041312&r1=1041311&r2=1041312&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 Thu Dec 2 09:06:13 2010 @@ -37,11 +37,11 @@ import org.apache.directory.server.kerbe 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.messages.value.KdcOptions; -import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; 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.messages.value.flags.TicketFlag; 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.junit.After; import org.junit.Before; 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=1041312&r1=1041311&r2=1041312&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 Thu Dec 2 09:06:13 2010 @@ -45,12 +45,12 @@ import org.apache.directory.server.kerbe 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.messages.value.KdcOptions; -import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime; 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.messages.value.flags.TicketFlag; import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.shared.kerberos.KerberosMessageType; +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.junit.After;