svn commit: rev 56102 - incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value

[erodriguez]

Author: erodriguez
Date: Sat Oct 30 18:04:35 2004
New Revision: 56102

Modified:
   
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value/KrbCredInfo.java
Log:
Replacing Realm and PrincipalName with JAAS KerberosPrincipal.

Modified: 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value/KrbCredInfo.java
==============================================================================
--- 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value/KrbCredInfo.java
  (original)
+++ 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/messages/value/KrbCredInfo.java
  Sat Oct 30 18:04:35 2004
@@ -16,38 +16,36 @@
  */
 package org.apache.kerberos.messages.value;
 
+import javax.security.auth.kerberos.*;
+
 /**
  * Kerberos credential information
  */
 public class KrbCredInfo {
 
-       private EncryptionKey  _key;
-       private Realm          _principalRealm;  //optional
-       private PrincipalName  _principalName;   //optional
-       private TicketFlags    _flags;           //optional
-       private KerberosTime   _authTime;        //optional
-       private KerberosTime   _startTime;       //optional
-       private KerberosTime   _endTime;         //optional
-       private KerberosTime   _renewTill;       //optional
-       private Realm          _serverRealm;     //optional
-       private PrincipalName  _serverName;      //optional
-       private HostAddresses  _clientAddresses; //optional
+       private EncryptionKey     _key;
+       private KerberosPrincipal _clientPrincipal; //optional
+       private TicketFlags       _flags;           //optional
+       private KerberosTime      _authTime;        //optional
+       private KerberosTime      _startTime;       //optional
+       private KerberosTime      _endTime;         //optional
+       private KerberosTime      _renewTill;       //optional
+       private KerberosPrincipal _serverPrincipal; //optional
+       private HostAddresses     _clientAddresses; //optional
 
-       public KrbCredInfo(EncryptionKey key, Realm principalRealm, 
PrincipalName principalName,
+       public KrbCredInfo(EncryptionKey key, KerberosPrincipal clientPrincipal,
                        TicketFlags flags, KerberosTime authTime, KerberosTime 
startTime,
-                       KerberosTime endTime, KerberosTime renewTill, Realm 
serverRealm,
-                       PrincipalName serverName, HostAddresses 
clientAddresses) {
+                       KerberosTime endTime, KerberosTime renewTill, 
KerberosPrincipal serverPrincipal,
+                       HostAddresses clientAddresses) {
                
                _key             = key;
-               _principalRealm  = principalRealm;
-               _principalName   = principalName;
+               _clientPrincipal = clientPrincipal;
                _flags           = flags;
                _authTime        = authTime;
                _startTime       = startTime;
                _endTime         = endTime;
                _renewTill       = renewTill;
-               _serverRealm     = serverRealm;
-               _serverName      = serverName;
+               _serverPrincipal = serverPrincipal;
                _clientAddresses = clientAddresses;
        }
 
@@ -66,20 +64,14 @@
        public EncryptionKey getKey() {
                return _key;
        }
-       public PrincipalName getPrincipalName() {
-               return _principalName;
-       }
-       public Realm getPrincipalRealm() {
-               return _principalRealm;
+       public KerberosPrincipal getClientPrincipal() {
+               return _clientPrincipal;
        }
        public KerberosTime getRenewTill() {
                return _renewTill;
        }
-       public PrincipalName getServerName() {
-               return _serverName;
-       }
-       public Realm getServerRealm() {
-               return _serverRealm;
+       public KerberosPrincipal getServerPrincipal() {
+               return _serverPrincipal;
        }
        public KerberosTime getStartTime() {
                return _startTime;