You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/11/29 01:02:21 UTC
[10/10] directory-kerby git commit: Renamed spec package to type for
Kerberos types defined in kerb-core module to be consistent with
ASN1/X509/CMS
Renamed spec package to type for Kerberos types defined in kerb-core module to be consistent with ASN1/X509/CMS
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/8483322e
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/8483322e
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/8483322e
Branch: refs/heads/master
Commit: 8483322e58310ff33685a1f3893b71e7cf5f246f
Parents: 1d41d3a
Author: Kai Zheng <ka...@intel.com>
Authored: Sun Nov 29 08:01:40 2015 +0800
Committer: Kai Zheng <ka...@intel.com>
Committed: Sun Nov 29 08:01:40 2015 +0800
----------------------------------------------------------------------
.../kerby/benchmark/KrbCodecBenchmark.java | 2 +-
.../identitybackend/JsonIdentityBackend.java | 6 +-
.../typeAdapter/EncryptionKeyAdapter.java | 2 +-
.../typeAdapter/KerberosTimeAdapter.java | 2 +-
.../typeAdapter/PrincipalNameAdapter.java | 2 +-
.../identitybackend/LdapIdentityBackend.java | 6 +-
.../identitybackend/LdapIdentityGetHelper.java | 6 +-
.../org/apache/kerby/KrbIdentitySerializer.java | 6 +-
.../apache/kerby/KrbIdentitySerializerTest.java | 6 +-
.../kdc/identitybackend/IdentityZNode.java | 8 +-
.../apache/kerby/kerberos/kdc/KerbyKdcTest.java | 4 +-
.../kerberos/kdc/WithAccessTokenKdcTest.java | 2 +-
.../kerberos/kdc/WithIdentityTokenKdcTest.java | 4 +-
.../kerberos/kdc/WithTokenKdcTestBase.java | 10 +-
.../test/jaas/TokenAuthLoginModule.java | 8 +-
.../integration/test/TokenLoginTestBase.java | 4 +-
.../kerby/kerberos/kerb/admin/AdminHelper.java | 8 +-
.../kerby/kerberos/kerb/admin/Kadmin.java | 4 +-
.../kerby/kerberos/kerb/client/KrbClient.java | 4 +-
.../kerby/kerberos/kerb/client/KrbConfig.java | 2 +-
.../kerby/kerberos/kerb/client/KrbHandler.java | 22 +-
.../kerberos/kerb/client/KrbPkinitClient.java | 2 +-
.../kerberos/kerb/client/KrbTokenClient.java | 6 +-
.../client/impl/AbstractInternalKrbClient.java | 8 +-
.../client/impl/DefaultInternalKrbClient.java | 4 +-
.../kerb/client/impl/InternalKrbClient.java | 4 +-
.../client/preauth/AbstractPreauthPlugin.java | 8 +-
.../client/preauth/KrbFastRequestState.java | 8 +-
.../kerb/client/preauth/KrbPreauth.java | 8 +-
.../kerb/client/preauth/PreauthContext.java | 4 +-
.../kerb/client/preauth/PreauthHandle.java | 6 +-
.../kerb/client/preauth/PreauthHandler.java | 6 +-
.../client/preauth/builtin/EncTsPreauth.java | 12 +-
.../kerb/client/preauth/builtin/TgtPreauth.java | 6 +-
.../client/preauth/pkinit/PkinitPreauth.java | 24 +-
.../preauth/pkinit/PkinitRequestContext.java | 2 +-
.../kerb/client/preauth/token/TokenContext.java | 2 +-
.../kerb/client/preauth/token/TokenPreauth.java | 20 +-
.../preauth/token/TokenRequestContext.java | 2 +-
.../kerb/client/request/ArmoredAsRequest.java | 2 +-
.../kerb/client/request/ArmoredRequest.java | 40 +--
.../kerb/client/request/ArmoredTgsRequest.java | 2 +-
.../kerberos/kerb/client/request/AsRequest.java | 22 +-
.../kerb/client/request/AsRequestWithCert.java | 2 +-
.../client/request/AsRequestWithKeytab.java | 4 +-
.../client/request/AsRequestWithPasswd.java | 4 +-
.../kerb/client/request/AsRequestWithToken.java | 2 +-
.../kerb/client/request/KdcRequest.java | 28 +-
.../kerb/client/request/TgsRequest.java | 18 +-
.../kerb/client/request/TgsRequestWithTgt.java | 24 +-
.../client/request/TgsRequestWithToken.java | 6 +-
.../kerberos/kerb/client/TestKrbConfigLoad.java | 2 +-
.../kerby/kerberos/kerb/auth/AuthContext.java | 8 +-
.../kerberos/kerb/common/CheckSumUtil.java | 8 +-
.../kerberos/kerb/common/EncryptionUtil.java | 8 +-
.../kerby/kerberos/kerb/common/Krb5Conf.java | 2 +-
.../kerberos/kerb/common/KrbErrorUtil.java | 18 +-
.../kerby/kerberos/kerb/common/KrbUtil.java | 4 +-
.../kerb/preauth/PreauthPluginMeta.java | 2 +-
.../kerb/preauth/builtin/EncTsPreauthMeta.java | 2 +-
.../kerb/preauth/builtin/TgtPreauthMeta.java | 2 +-
.../kerb/preauth/pkinit/PkinitIdenity.java | 2 +-
.../kerb/preauth/pkinit/PkinitPreauthMeta.java | 2 +-
.../kerb/preauth/pkinit/PluginOpts.java | 4 +-
.../kerb/preauth/token/TokenPreauthMeta.java | 2 +-
.../kerby/kerberos/kerb/codec/CodecTest.java | 4 +-
.../kerberos/kerb/codec/TestAsRepCodec.java | 10 +-
.../kerberos/kerb/codec/TestAsReqCodec.java | 22 +-
.../kerberos/kerb/codec/TestTgsRepCodec.java | 10 +-
.../kerberos/kerb/codec/TestTgsReqCodec.java | 18 +-
.../apache/kerby/kerberos/kerb/KrbCodec.java | 16 +-
.../kerby/kerberos/kerb/KrbErrorException.java | 2 +-
.../kerberos/kerb/provider/TokenDecoder.java | 2 +-
.../kerberos/kerb/provider/TokenEncoder.java | 2 +-
.../kerberos/kerb/provider/TokenFactory.java | 2 +-
.../kerberos/kerb/spec/KerberosString.java | 35 --
.../kerberos/kerb/spec/KerberosStrings.java | 43 ---
.../kerby/kerberos/kerb/spec/KerberosTime.java | 160 ---------
.../kerberos/kerb/spec/KrbAppSequenceType.java | 57 ----
.../kerby/kerberos/kerb/spec/KrbIntegers.java | 54 ---
.../kerberos/kerb/spec/KrbSequenceOfType.java | 43 ---
.../kerberos/kerb/spec/KrbSequenceType.java | 55 ---
.../kerby/kerberos/kerb/spec/ad/AdToken.java | 51 ---
.../kerb/spec/ad/AuthorizationData.java | 32 --
.../kerb/spec/ad/AuthorizationDataEntry.java | 63 ----
.../kerb/spec/ad/AuthorizationType.java | 143 --------
.../kerby/kerberos/kerb/spec/ap/ApOption.java | 58 ----
.../kerby/kerberos/kerb/spec/ap/ApOptions.java | 33 --
.../kerby/kerberos/kerb/spec/ap/ApRep.java | 66 ----
.../kerby/kerberos/kerb/spec/ap/ApReq.java | 90 -----
.../kerberos/kerb/spec/ap/Authenticator.java | 145 --------
.../kerberos/kerb/spec/ap/EncAPRepPart.java | 86 -----
.../kerberos/kerb/spec/base/AuthToken.java | 144 --------
.../kerby/kerberos/kerb/spec/base/CheckSum.java | 114 -------
.../kerberos/kerb/spec/base/CheckSumType.java | 123 -------
.../kerberos/kerb/spec/base/EncryptedData.java | 115 -------
.../kerberos/kerb/spec/base/EncryptionKey.java | 128 -------
.../kerberos/kerb/spec/base/EncryptionType.java | 140 --------
.../kerberos/kerb/spec/base/EtypeInfo.java | 29 --
.../kerberos/kerb/spec/base/EtypeInfo2.java | 29 --
.../kerb/spec/base/EtypeInfo2Entry.java | 74 ----
.../kerberos/kerb/spec/base/EtypeInfoEntry.java | 62 ----
.../kerberos/kerb/spec/base/HostAddrType.java | 100 ------
.../kerberos/kerb/spec/base/HostAddress.java | 110 ------
.../kerberos/kerb/spec/base/HostAddresses.java | 43 ---
.../kerby/kerberos/kerb/spec/base/KeyUsage.java | 129 -------
.../kerby/kerberos/kerb/spec/base/KrbError.java | 167 ---------
.../kerberos/kerb/spec/base/KrbMessage.java | 54 ---
.../kerberos/kerb/spec/base/KrbMessageType.java | 59 ----
.../kerby/kerberos/kerb/spec/base/KrbToken.java | 335 -------------------
.../kerby/kerberos/kerb/spec/base/LastReq.java | 32 --
.../kerberos/kerb/spec/base/LastReqEntry.java | 63 ----
.../kerberos/kerb/spec/base/LastReqType.java | 62 ----
.../kerberos/kerb/spec/base/MethodData.java | 30 --
.../kerby/kerberos/kerb/spec/base/NameType.java | 54 ---
.../kerberos/kerb/spec/base/PrincipalName.java | 202 -----------
.../kerby/kerberos/kerb/spec/base/Realm.java | 34 --
.../kerby/kerberos/kerb/spec/base/SamType.java | 65 ----
.../kerberos/kerb/spec/base/TokenFormat.java | 50 ---
.../kerb/spec/base/TransitedEncoding.java | 63 ----
.../kerb/spec/base/TransitedEncodingType.java | 51 ---
.../kerberos/kerb/spec/fast/ArmorType.java | 50 ---
.../kerberos/kerb/spec/fast/FastOption.java | 51 ---
.../kerberos/kerb/spec/fast/FastOptions.java | 33 --
.../kerberos/kerb/spec/fast/KrbFastArmor.java | 65 ----
.../kerb/spec/fast/KrbFastArmoredRep.java | 53 ---
.../kerb/spec/fast/KrbFastArmoredReq.java | 96 ------
.../kerb/spec/fast/KrbFastFinished.java | 83 -----
.../kerberos/kerb/spec/fast/KrbFastReq.java | 79 -----
.../kerb/spec/fast/KrbFastResponse.java | 91 -----
.../kerberos/kerb/spec/fast/PaAuthnEntry.java | 81 -----
.../kerberos/kerb/spec/fast/PaAuthnSet.java | 29 --
.../kerberos/kerb/spec/fast/PaFxFastReply.java | 49 ---
.../kerb/spec/fast/PaFxFastRequest.java | 49 ---
.../kerby/kerberos/kerb/spec/kdc/AsRep.java | 32 --
.../kerby/kerberos/kerb/spec/kdc/AsReq.java | 31 --
.../kerberos/kerb/spec/kdc/EncAsRepPart.java | 31 --
.../kerberos/kerb/spec/kdc/EncKdcRepPart.java | 178 ----------
.../kerberos/kerb/spec/kdc/EncTgsRepPart.java | 31 --
.../kerby/kerberos/kerb/spec/kdc/KdcOption.java | 79 -----
.../kerberos/kerb/spec/kdc/KdcOptions.java | 33 --
.../kerby/kerberos/kerb/spec/kdc/KdcRep.java | 117 -------
.../kerby/kerberos/kerb/spec/kdc/KdcReq.java | 77 -----
.../kerberos/kerb/spec/kdc/KdcReqBody.java | 214 ------------
.../kerby/kerberos/kerb/spec/kdc/TgsRep.java | 31 --
.../kerby/kerberos/kerb/spec/kdc/TgsReq.java | 32 --
.../kerb/spec/pa/PaAuthenticationSet.java | 29 --
.../kerb/spec/pa/PaAuthenticationSetElem.java | 75 -----
.../kerby/kerberos/kerb/spec/pa/PaData.java | 41 ---
.../kerberos/kerb/spec/pa/PaDataEntry.java | 70 ----
.../kerby/kerberos/kerb/spec/pa/PaDataType.java | 92 -----
.../kerby/kerberos/kerb/spec/pa/PaEncTsEnc.java | 67 ----
.../kerberos/kerb/spec/pa/otp/OtpTokenInfo.java | 70 ----
.../kerb/spec/pa/otp/PaOtpChallenge.java | 56 ----
.../spec/pa/pkinit/AdInitialVerifiedCas.java | 28 --
.../spec/pa/pkinit/AlgorithmIdentifiers.java | 30 --
.../kerberos/kerb/spec/pa/pkinit/AuthPack.java | 83 -----
.../kerberos/kerb/spec/pa/pkinit/DHNonce.java | 28 --
.../kerberos/kerb/spec/pa/pkinit/DHRepInfo.java | 62 ----
.../pa/pkinit/ExternalPrincipalIdentifier.java | 72 ----
.../kerb/spec/pa/pkinit/KdcDHKeyInfo.java | 66 ----
.../kerb/spec/pa/pkinit/Krb5PrincipalName.java | 62 ----
.../kerberos/kerb/spec/pa/pkinit/PaPkAsRep.java | 62 ----
.../kerberos/kerb/spec/pa/pkinit/PaPkAsReq.java | 73 ----
.../kerb/spec/pa/pkinit/PkAuthenticator.java | 92 -----
.../kerb/spec/pa/pkinit/ReplyKeyPack.java | 62 ----
.../kerb/spec/pa/pkinit/TdDhParameters.java | 26 --
.../kerb/spec/pa/pkinit/TrustedCertifiers.java | 29 --
.../kerb/spec/pa/token/PaTokenChallenge.java | 41 ---
.../kerb/spec/pa/token/PaTokenRequest.java | 62 ----
.../kerberos/kerb/spec/pa/token/TokenFlag.java | 51 ---
.../kerberos/kerb/spec/pa/token/TokenFlags.java | 39 ---
.../kerberos/kerb/spec/pa/token/TokenInfo.java | 63 ----
.../kerberos/kerb/spec/pa/token/TokenInfos.java | 29 --
.../kerb/spec/ticket/EncTicketPart.java | 169 ----------
.../kerberos/kerb/spec/ticket/KrbTicket.java | 49 ---
.../kerberos/kerb/spec/ticket/SgtTicket.java | 31 --
.../kerberos/kerb/spec/ticket/TgtTicket.java | 39 ---
.../kerby/kerberos/kerb/spec/ticket/Ticket.java | 100 ------
.../kerberos/kerb/spec/ticket/TicketFlag.java | 62 ----
.../kerberos/kerb/spec/ticket/TicketFlags.java | 39 ---
.../kerberos/kerb/spec/ticket/Tickets.java | 29 --
.../kerberos/kerb/type/KerberosString.java | 35 ++
.../kerberos/kerb/type/KerberosStrings.java | 43 +++
.../kerby/kerberos/kerb/type/KerberosTime.java | 160 +++++++++
.../kerberos/kerb/type/KrbAppSequenceType.java | 57 ++++
.../kerby/kerberos/kerb/type/KrbIntegers.java | 54 +++
.../kerberos/kerb/type/KrbSequenceOfType.java | 43 +++
.../kerberos/kerb/type/KrbSequenceType.java | 55 +++
.../kerby/kerberos/kerb/type/ad/AdToken.java | 51 +++
.../kerb/type/ad/AuthorizationData.java | 32 ++
.../kerb/type/ad/AuthorizationDataEntry.java | 63 ++++
.../kerb/type/ad/AuthorizationType.java | 143 ++++++++
.../kerby/kerberos/kerb/type/ap/ApOption.java | 58 ++++
.../kerby/kerberos/kerb/type/ap/ApOptions.java | 33 ++
.../kerby/kerberos/kerb/type/ap/ApRep.java | 66 ++++
.../kerby/kerberos/kerb/type/ap/ApReq.java | 90 +++++
.../kerberos/kerb/type/ap/Authenticator.java | 145 ++++++++
.../kerberos/kerb/type/ap/EncAPRepPart.java | 86 +++++
.../kerberos/kerb/type/base/AuthToken.java | 144 ++++++++
.../kerby/kerberos/kerb/type/base/CheckSum.java | 114 +++++++
.../kerberos/kerb/type/base/CheckSumType.java | 123 +++++++
.../kerberos/kerb/type/base/EncryptedData.java | 115 +++++++
.../kerberos/kerb/type/base/EncryptionKey.java | 128 +++++++
.../kerberos/kerb/type/base/EncryptionType.java | 140 ++++++++
.../kerberos/kerb/type/base/EtypeInfo.java | 29 ++
.../kerberos/kerb/type/base/EtypeInfo2.java | 29 ++
.../kerb/type/base/EtypeInfo2Entry.java | 74 ++++
.../kerberos/kerb/type/base/EtypeInfoEntry.java | 62 ++++
.../kerberos/kerb/type/base/HostAddrType.java | 100 ++++++
.../kerberos/kerb/type/base/HostAddress.java | 110 ++++++
.../kerberos/kerb/type/base/HostAddresses.java | 43 +++
.../kerby/kerberos/kerb/type/base/KeyUsage.java | 129 +++++++
.../kerby/kerberos/kerb/type/base/KrbError.java | 167 +++++++++
.../kerberos/kerb/type/base/KrbMessage.java | 54 +++
.../kerberos/kerb/type/base/KrbMessageType.java | 59 ++++
.../kerby/kerberos/kerb/type/base/KrbToken.java | 335 +++++++++++++++++++
.../kerby/kerberos/kerb/type/base/LastReq.java | 32 ++
.../kerberos/kerb/type/base/LastReqEntry.java | 63 ++++
.../kerberos/kerb/type/base/LastReqType.java | 62 ++++
.../kerberos/kerb/type/base/MethodData.java | 30 ++
.../kerby/kerberos/kerb/type/base/NameType.java | 54 +++
.../kerberos/kerb/type/base/PrincipalName.java | 202 +++++++++++
.../kerby/kerberos/kerb/type/base/Realm.java | 34 ++
.../kerby/kerberos/kerb/type/base/SamType.java | 65 ++++
.../kerberos/kerb/type/base/TokenFormat.java | 50 +++
.../kerb/type/base/TransitedEncoding.java | 63 ++++
.../kerb/type/base/TransitedEncodingType.java | 51 +++
.../kerberos/kerb/type/fast/ArmorType.java | 50 +++
.../kerberos/kerb/type/fast/FastOption.java | 51 +++
.../kerberos/kerb/type/fast/FastOptions.java | 33 ++
.../kerberos/kerb/type/fast/KrbFastArmor.java | 65 ++++
.../kerb/type/fast/KrbFastArmoredRep.java | 53 +++
.../kerb/type/fast/KrbFastArmoredReq.java | 96 ++++++
.../kerb/type/fast/KrbFastFinished.java | 83 +++++
.../kerberos/kerb/type/fast/KrbFastReq.java | 79 +++++
.../kerb/type/fast/KrbFastResponse.java | 91 +++++
.../kerberos/kerb/type/fast/PaAuthnEntry.java | 81 +++++
.../kerberos/kerb/type/fast/PaAuthnSet.java | 29 ++
.../kerberos/kerb/type/fast/PaFxFastReply.java | 49 +++
.../kerb/type/fast/PaFxFastRequest.java | 49 +++
.../kerby/kerberos/kerb/type/kdc/AsRep.java | 32 ++
.../kerby/kerberos/kerb/type/kdc/AsReq.java | 31 ++
.../kerberos/kerb/type/kdc/EncAsRepPart.java | 31 ++
.../kerberos/kerb/type/kdc/EncKdcRepPart.java | 178 ++++++++++
.../kerberos/kerb/type/kdc/EncTgsRepPart.java | 31 ++
.../kerby/kerberos/kerb/type/kdc/KdcOption.java | 79 +++++
.../kerberos/kerb/type/kdc/KdcOptions.java | 33 ++
.../kerby/kerberos/kerb/type/kdc/KdcRep.java | 117 +++++++
.../kerby/kerberos/kerb/type/kdc/KdcReq.java | 77 +++++
.../kerberos/kerb/type/kdc/KdcReqBody.java | 214 ++++++++++++
.../kerby/kerberos/kerb/type/kdc/TgsRep.java | 31 ++
.../kerby/kerberos/kerb/type/kdc/TgsReq.java | 32 ++
.../kerb/type/pa/PaAuthenticationSet.java | 29 ++
.../kerb/type/pa/PaAuthenticationSetElem.java | 75 +++++
.../kerby/kerberos/kerb/type/pa/PaData.java | 41 +++
.../kerberos/kerb/type/pa/PaDataEntry.java | 70 ++++
.../kerby/kerberos/kerb/type/pa/PaDataType.java | 92 +++++
.../kerby/kerberos/kerb/type/pa/PaEncTsEnc.java | 67 ++++
.../kerberos/kerb/type/pa/otp/OtpTokenInfo.java | 70 ++++
.../kerb/type/pa/otp/PaOtpChallenge.java | 56 ++++
.../type/pa/pkinit/AdInitialVerifiedCas.java | 28 ++
.../type/pa/pkinit/AlgorithmIdentifiers.java | 30 ++
.../kerberos/kerb/type/pa/pkinit/AuthPack.java | 83 +++++
.../kerberos/kerb/type/pa/pkinit/DHNonce.java | 28 ++
.../kerberos/kerb/type/pa/pkinit/DHRepInfo.java | 62 ++++
.../pa/pkinit/ExternalPrincipalIdentifier.java | 72 ++++
.../kerb/type/pa/pkinit/KdcDHKeyInfo.java | 66 ++++
.../kerb/type/pa/pkinit/Krb5PrincipalName.java | 62 ++++
.../kerberos/kerb/type/pa/pkinit/PaPkAsRep.java | 62 ++++
.../kerberos/kerb/type/pa/pkinit/PaPkAsReq.java | 73 ++++
.../kerb/type/pa/pkinit/PkAuthenticator.java | 92 +++++
.../kerb/type/pa/pkinit/ReplyKeyPack.java | 62 ++++
.../kerb/type/pa/pkinit/TdDhParameters.java | 26 ++
.../kerb/type/pa/pkinit/TrustedCertifiers.java | 29 ++
.../kerb/type/pa/token/PaTokenChallenge.java | 41 +++
.../kerb/type/pa/token/PaTokenRequest.java | 62 ++++
.../kerberos/kerb/type/pa/token/TokenFlag.java | 51 +++
.../kerberos/kerb/type/pa/token/TokenFlags.java | 39 +++
.../kerberos/kerb/type/pa/token/TokenInfo.java | 63 ++++
.../kerberos/kerb/type/pa/token/TokenInfos.java | 29 ++
.../kerb/type/ticket/EncTicketPart.java | 169 ++++++++++
.../kerberos/kerb/type/ticket/KrbTicket.java | 49 +++
.../kerberos/kerb/type/ticket/SgtTicket.java | 31 ++
.../kerberos/kerb/type/ticket/TgtTicket.java | 39 +++
.../kerby/kerberos/kerb/type/ticket/Ticket.java | 100 ++++++
.../kerberos/kerb/type/ticket/TicketFlag.java | 62 ++++
.../kerberos/kerb/type/ticket/TicketFlags.java | 39 +++
.../kerberos/kerb/type/ticket/Tickets.java | 29 ++
.../kerberos/kerb/crypto/CheckSumHandler.java | 6 +-
.../kerb/crypto/CheckSumTypeHandler.java | 2 +-
.../kerberos/kerb/crypto/EncTypeHandler.java | 4 +-
.../kerberos/kerb/crypto/EncryptionHandler.java | 10 +-
.../crypto/cksum/CmacCamellia128CheckSum.java | 2 +-
.../crypto/cksum/CmacCamellia256CheckSum.java | 2 +-
.../kerb/crypto/cksum/Crc32CheckSum.java | 2 +-
.../kerb/crypto/cksum/DesCbcCheckSum.java | 2 +-
.../kerb/crypto/cksum/HmacMd5Rc4CheckSum.java | 2 +-
.../crypto/cksum/HmacSha1Aes128CheckSum.java | 2 +-
.../crypto/cksum/HmacSha1Aes256CheckSum.java | 2 +-
.../kerb/crypto/cksum/HmacSha1Des3CheckSum.java | 2 +-
.../kerb/crypto/cksum/Md5HmacRc4CheckSum.java | 2 +-
.../kerb/crypto/cksum/RsaMd4CheckSum.java | 2 +-
.../kerb/crypto/cksum/RsaMd4DesCheckSum.java | 2 +-
.../kerb/crypto/cksum/RsaMd5CheckSum.java | 2 +-
.../kerb/crypto/cksum/RsaMd5DesCheckSum.java | 2 +-
.../kerb/crypto/cksum/Sha1CheckSum.java | 2 +-
.../kerb/crypto/enc/Aes128CtsHmacSha1Enc.java | 4 +-
.../kerb/crypto/enc/Aes256CtsHmacSha1Enc.java | 4 +-
.../kerb/crypto/enc/Camellia128CtsCmacEnc.java | 4 +-
.../kerb/crypto/enc/Camellia256CtsCmacEnc.java | 4 +-
.../kerb/crypto/enc/Des3CbcSha1Enc.java | 4 +-
.../kerberos/kerb/crypto/enc/DesCbcCrcEnc.java | 4 +-
.../kerberos/kerb/crypto/enc/DesCbcMd4Enc.java | 4 +-
.../kerberos/kerb/crypto/enc/DesCbcMd5Enc.java | 4 +-
.../kerberos/kerb/crypto/enc/KeKiCmacEnc.java | 2 +-
.../kerberos/kerb/crypto/enc/Rc4HmacEnc.java | 4 +-
.../kerberos/kerb/crypto/enc/Rc4HmacExpEnc.java | 2 +-
.../kerberos/kerb/crypto/fast/FastUtil.java | 2 +-
.../kerberos/kerb/crypto/CheckSumTest.java | 10 +-
.../kerberos/kerb/crypto/CheckSumsTest.java | 8 +-
.../kerberos/kerb/crypto/DecryptionTest.java | 6 +-
.../kerberos/kerb/crypto/FastUtilTest.java | 4 +-
.../kerberos/kerb/crypto/KeyDeriveTest.java | 2 +-
.../kerby/kerberos/kerb/crypto/PrfTest.java | 2 +-
.../kerberos/kerb/crypto/String2keyTest.java | 4 +-
.../kerb/identity/backend/BackendTest.java | 4 +-
.../kerb/identity/backend/BackendTestUtil.java | 6 +-
.../kerberos/kerb/identity/KrbIdentity.java | 8 +-
.../kerby/kerberos/kerb/server/KdcTest.java | 4 +-
.../kerberos/kerb/server/LoginTestBase.java | 2 +-
.../kerb/server/MultiRequestsKdcTest.java | 4 +-
.../kerby/kerberos/kerb/server/KdcConfig.java | 2 +-
.../kerby/kerberos/kerb/server/KdcHandler.java | 16 +-
.../kerb/server/KdcRecoverableException.java | 2 +-
.../server/preauth/AbstractPreauthPlugin.java | 6 +-
.../kerb/server/preauth/KdcFastContext.java | 6 +-
.../kerb/server/preauth/KdcPreauth.java | 6 +-
.../kerb/server/preauth/PreauthHandle.java | 4 +-
.../kerb/server/preauth/PreauthHandler.java | 6 +-
.../server/preauth/builtin/EncTsPreauth.java | 10 +-
.../kerb/server/preauth/builtin/TgtPreauth.java | 2 +-
.../server/preauth/pkinit/PkinitPreauth.java | 8 +-
.../preauth/pkinit/PkinitRequestContext.java | 4 +-
.../kerb/server/preauth/token/TokenPreauth.java | 20 +-
.../preauth/token/TokenRequestContext.java | 2 +-
.../kerberos/kerb/server/request/AsRequest.java | 32 +-
.../kerb/server/request/KdcRequest.java | 54 +--
.../server/request/ServiceTicketIssuer.java | 8 +-
.../kerb/server/request/TgsRequest.java | 46 +--
.../kerb/server/request/TgtTicketIssuer.java | 4 +-
.../kerb/server/request/TicketIssuer.java | 32 +-
.../kerby/kerberos/kerb/KrbInputStream.java | 8 +-
.../kerby/kerberos/kerb/KrbOutputStream.java | 6 +-
.../kerb/ccache/CredCacheInputStream.java | 24 +-
.../kerb/ccache/CredCacheOutputStream.java | 18 +-
.../kerby/kerberos/kerb/ccache/Credential.java | 20 +-
.../kerberos/kerb/ccache/CredentialCache.java | 6 +-
.../kerb/ccache/KrbCredentialCache.java | 2 +-
.../kerby/kerberos/kerb/keytab/Keytab.java | 6 +-
.../kerby/kerberos/kerb/keytab/KeytabEntry.java | 6 +-
.../kerberos/kerb/keytab/KeytabInputStream.java | 10 +-
.../kerb/keytab/KeytabOutputStream.java | 4 +-
.../kerby/kerberos/kerb/keytab/KrbKeytab.java | 6 +-
.../kerby/kerberos/kerb/util/CcacheTest.java | 2 +-
.../kerberos/kerb/util/EncryptionTest.java | 14 +-
.../kerby/kerberos/kerb/util/KeysTest.java | 6 +-
.../kerby/kerberos/kerb/util/KeytabTest.java | 2 +-
.../kerberos/kerb/util/NewEncryptionTest.java | 8 +-
.../kerberos/provider/token/JwtAuthToken.java | 2 +-
.../provider/token/JwtTokenDecoder.java | 2 +-
.../provider/token/JwtTokenEncoder.java | 2 +-
.../provider/token/JwtTokenProvider.java | 2 +-
.../kerberos/provider/token/TokenTest.java | 2 +-
.../kerby/kerberos/tool/kinit/KinitTool.java | 4 +-
.../kerby/kerberos/tool/klist/KlistTool.java | 2 +-
.../kerby/kerberos/tool/token/TokenInit.java | 2 +-
.../kadmin/command/GetPrincipalCommand.java | 4 +-
378 files changed, 8225 insertions(+), 8225 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
----------------------------------------------------------------------
diff --git a/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java b/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
index 48c2703..1be8bbf 100644
--- a/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
+++ b/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
@@ -21,7 +21,7 @@ package org.apache.kerby.benchmark;
import org.apache.directory.api.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.kerberos.codec.apReq.ApReqContainer;
-import org.apache.kerby.kerberos.kerb.spec.ap.ApReq;
+import org.apache.kerby.kerberos.kerb.type.ap.ApReq;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
index cc1da07..b65ec0b 100644
--- a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
+++ b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java
@@ -30,9 +30,9 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.identity.BatchTrans;
import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
import org.apache.kerby.kerberos.kerb.identity.backend.AbstractIdentityBackend;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
import org.apache.kerby.util.IOUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/EncryptionKeyAdapter.java
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/EncryptionKeyAdapter.java b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/EncryptionKeyAdapter.java
index ff0dfdd..fd3fd20 100644
--- a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/EncryptionKeyAdapter.java
+++ b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/EncryptionKeyAdapter.java
@@ -26,7 +26,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
import org.apache.kerby.util.HexUtil;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/KerberosTimeAdapter.java
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/KerberosTimeAdapter.java b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/KerberosTimeAdapter.java
index 7c4b6eb..7a499d5 100644
--- a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/KerberosTimeAdapter.java
+++ b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/KerberosTimeAdapter.java
@@ -26,7 +26,7 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
import java.lang.reflect.Type;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/PrincipalNameAdapter.java
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/PrincipalNameAdapter.java b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/PrincipalNameAdapter.java
index d9d61a4..6946193 100644
--- a/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/PrincipalNameAdapter.java
+++ b/kerby-backend/json-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/typeAdapter/PrincipalNameAdapter.java
@@ -26,7 +26,7 @@ import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
import java.lang.reflect.Type;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
index 3c9c39e..9d6151d 100644
--- a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
+++ b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
@@ -38,9 +38,9 @@ import org.apache.kerby.config.Config;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
import org.apache.kerby.kerberos.kerb.identity.backend.AbstractIdentityBackend;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java
----------------------------------------------------------------------
diff --git a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java
index ba19ae0..bc070dc 100644
--- a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java
+++ b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityGetHelper.java
@@ -24,9 +24,9 @@ import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
import org.apache.directory.api.util.GeneralizedTime;
import org.apache.directory.shared.kerberos.KerberosAttribute;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
import java.io.IOException;
import java.text.ParseException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java b/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java
index 22766ec..dc3df02 100644
--- a/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java
+++ b/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/KrbIdentitySerializer.java
@@ -25,9 +25,9 @@ import org.apache.directory.mavibot.btree.serializer.IntSerializer;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
import org.apache.directory.mavibot.btree.serializer.StringSerializer;
import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java b/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java
index 4220d46..4c82bfb 100644
--- a/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java
+++ b/kerby-backend/mavibot-backend/src/test/java/org/apache/kerby/KrbIdentitySerializerTest.java
@@ -20,9 +20,9 @@
package org.apache.kerby;
import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
import org.junit.Test;
import java.nio.ByteBuffer;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java
index 5c41a71..1f08279 100644
--- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java
+++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNode.java
@@ -20,10 +20,10 @@
package org.apache.kerby.kerberos.kdc.identitybackend;
import org.apache.kerby.kerberos.kerb.crypto.util.BytesUtil;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
import org.apache.kerby.util.Utf8;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java
index d601838..3e6ce3b 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/KerbyKdcTest.java
@@ -22,8 +22,8 @@ package org.apache.kerby.kerberos.kdc;
import org.apache.kerby.kerberos.kdc.impl.NettyKdcServerImpl;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.server.KdcTestBase;
-import org.apache.kerby.kerberos.kerb.spec.ticket.SgtTicket;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import org.junit.Assert;
import static org.assertj.core.api.Assertions.assertThat;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithAccessTokenKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithAccessTokenKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithAccessTokenKdcTest.java
index 27eeac4..3971265 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithAccessTokenKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithAccessTokenKdcTest.java
@@ -30,7 +30,7 @@ import org.apache.kerby.kerberos.kerb.client.KrbTokenClient;
import org.apache.kerby.kerberos.kerb.common.PrivateKeyReader;
import org.apache.kerby.kerberos.kerb.common.PublicKeyReader;
import org.apache.kerby.kerberos.kerb.server.TestKdcServer;
-import org.apache.kerby.kerberos.kerb.spec.ticket.SgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithIdentityTokenKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithIdentityTokenKdcTest.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithIdentityTokenKdcTest.java
index eeb3938..5eaa176 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithIdentityTokenKdcTest.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithIdentityTokenKdcTest.java
@@ -24,8 +24,8 @@ import org.apache.kerby.kerberos.kerb.client.KrbTokenClient;
import org.apache.kerby.kerberos.kerb.common.PrivateKeyReader;
import org.apache.kerby.kerberos.kerb.common.PublicKeyReader;
import org.apache.kerby.kerberos.kerb.server.TestKdcServer;
-import org.apache.kerby.kerberos.kerb.spec.ticket.SgtTicket;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
index 322a387..27bdc50 100644
--- a/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
+++ b/kerby-kdc-test/src/test/java/org/apache/kerby/kerberos/kdc/WithTokenKdcTestBase.java
@@ -27,11 +27,11 @@ import org.apache.kerby.kerberos.kerb.common.PrivateKeyReader;
import org.apache.kerby.kerberos.kerb.provider.TokenEncoder;
import org.apache.kerby.kerberos.kerb.server.KdcConfigKey;
import org.apache.kerby.kerberos.kerb.server.KdcTestBase;
-import org.apache.kerby.kerberos.kerb.spec.base.AuthToken;
-import org.apache.kerby.kerberos.kerb.spec.base.KrbToken;
-import org.apache.kerby.kerberos.kerb.spec.base.TokenFormat;
-import org.apache.kerby.kerberos.kerb.spec.ticket.KrbTicket;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.base.AuthToken;
+import org.apache.kerby.kerberos.kerb.type.base.KrbToken;
+import org.apache.kerby.kerberos.kerb.type.base.TokenFormat;
+import org.apache.kerby.kerberos.kerb.type.ticket.KrbTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import org.apache.kerby.kerberos.provider.token.JwtTokenEncoder;
import org.apache.kerby.kerberos.provider.token.JwtTokenProvider;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java
index 195158a..d3c55d9 100644
--- a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java
+++ b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java
@@ -28,10 +28,10 @@ import org.apache.kerby.kerberos.kerb.client.KrbTokenClient;
import org.apache.kerby.kerberos.kerb.common.PrivateKeyReader;
import org.apache.kerby.kerberos.kerb.provider.TokenDecoder;
import org.apache.kerby.kerberos.kerb.provider.TokenEncoder;
-import org.apache.kerby.kerberos.kerb.spec.base.AuthToken;
-import org.apache.kerby.kerberos.kerb.spec.base.KrbToken;
-import org.apache.kerby.kerberos.kerb.spec.base.TokenFormat;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.base.AuthToken;
+import org.apache.kerby.kerberos.kerb.type.base.KrbToken;
+import org.apache.kerby.kerberos.kerb.type.base.TokenFormat;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import org.apache.kerby.kerberos.provider.token.JwtTokenEncoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
index 1674e2a..6ee1f8a 100644
--- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
+++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestBase.java
@@ -27,8 +27,8 @@ import org.apache.kerby.kerberos.kerb.provider.TokenEncoder;
import org.apache.kerby.kerberos.kerb.server.KdcConfigKey;
import org.apache.kerby.kerberos.kerb.server.LoginTestBase;
import org.apache.kerby.kerberos.kerb.server.TestKdcServer;
-import org.apache.kerby.kerberos.kerb.spec.base.AuthToken;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.base.AuthToken;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import org.apache.kerby.kerberos.provider.token.JwtTokenProvider;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java
index bbc37a9..a8a7979 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/AdminHelper.java
@@ -24,10 +24,10 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.identity.KrbIdentity;
import org.apache.kerby.kerberos.kerb.keytab.Keytab;
import org.apache.kerby.kerberos.kerb.keytab.KeytabEntry;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/Kadmin.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/Kadmin.java b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/Kadmin.java
index ea4bacc..d84de1f 100644
--- a/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/Kadmin.java
+++ b/kerby-kerb/kerb-admin/src/main/java/org/apache/kerby/kerberos/kerb/admin/Kadmin.java
@@ -30,8 +30,8 @@ import org.apache.kerby.kerberos.kerb.keytab.Keytab;
import org.apache.kerby.kerberos.kerb.server.KdcConfig;
import org.apache.kerby.kerberos.kerb.server.KdcSetting;
import org.apache.kerby.kerberos.kerb.server.KdcUtil;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClient.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClient.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClient.java
index b828f92..7eae22b 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClient.java
@@ -24,8 +24,8 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.ccache.CredentialCache;
import org.apache.kerby.kerberos.kerb.client.impl.DefaultInternalKrbClient;
import org.apache.kerby.kerberos.kerb.client.impl.InternalKrbClient;
-import org.apache.kerby.kerberos.kerb.spec.ticket.SgtTicket;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbConfig.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbConfig.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbConfig.java
index eeb5a1d..966f720 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbConfig.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbConfig.java
@@ -20,7 +20,7 @@
package org.apache.kerby.kerberos.kerb.client;
import org.apache.kerby.kerberos.kerb.common.Krb5Conf;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java
index 89eb1f5..3966d83 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java
@@ -24,17 +24,17 @@ import org.apache.kerby.kerberos.kerb.KrbErrorCode;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.preauth.PreauthHandler;
import org.apache.kerby.kerberos.kerb.client.request.KdcRequest;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
-import org.apache.kerby.kerberos.kerb.spec.base.EtypeInfo2;
-import org.apache.kerby.kerberos.kerb.spec.base.EtypeInfo2Entry;
-import org.apache.kerby.kerberos.kerb.spec.base.KrbError;
-import org.apache.kerby.kerberos.kerb.spec.base.KrbMessage;
-import org.apache.kerby.kerberos.kerb.spec.base.KrbMessageType;
-import org.apache.kerby.kerberos.kerb.spec.base.MethodData;
-import org.apache.kerby.kerberos.kerb.spec.kdc.KdcRep;
-import org.apache.kerby.kerberos.kerb.spec.kdc.KdcReq;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.base.EtypeInfo2;
+import org.apache.kerby.kerberos.kerb.type.base.EtypeInfo2Entry;
+import org.apache.kerby.kerberos.kerb.type.base.KrbError;
+import org.apache.kerby.kerberos.kerb.type.base.KrbMessage;
+import org.apache.kerby.kerberos.kerb.type.base.KrbMessageType;
+import org.apache.kerby.kerberos.kerb.type.base.MethodData;
+import org.apache.kerby.kerberos.kerb.type.kdc.KdcRep;
+import org.apache.kerby.kerberos.kerb.type.kdc.KdcReq;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
import org.apache.kerby.kerberos.kerb.transport.KrbTransport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbPkinitClient.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbPkinitClient.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbPkinitClient.java
index 7f302fd..2fb2712 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbPkinitClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbPkinitClient.java
@@ -21,7 +21,7 @@ package org.apache.kerby.kerberos.kerb.client;
import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import java.security.PrivateKey;
import java.security.cert.Certificate;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbTokenClient.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbTokenClient.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbTokenClient.java
index 66d8d75..5b70e3e 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbTokenClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbTokenClient.java
@@ -21,9 +21,9 @@ package org.apache.kerby.kerberos.kerb.client;
import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.base.AuthToken;
-import org.apache.kerby.kerberos.kerb.spec.ticket.SgtTicket;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.base.AuthToken;
+import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
/**
* A krb token client API for applications to interact with KDC using token.
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
index d27609b..25155c8 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
@@ -33,10 +33,10 @@ import org.apache.kerby.kerberos.kerb.client.request.AsRequestWithToken;
import org.apache.kerby.kerberos.kerb.client.request.TgsRequest;
import org.apache.kerby.kerberos.kerb.client.request.TgsRequestWithTgt;
import org.apache.kerby.kerberos.kerb.client.request.TgsRequestWithToken;
-import org.apache.kerby.kerberos.kerb.spec.base.NameType;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
-import org.apache.kerby.kerberos.kerb.spec.ticket.SgtTicket;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.base.NameType;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
/**
* A krb client API for applications to interact with KDC
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
index 26943c6..b6d799f 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
@@ -24,8 +24,8 @@ import org.apache.kerby.kerberos.kerb.client.ClientUtil;
import org.apache.kerby.kerberos.kerb.client.KrbSetting;
import org.apache.kerby.kerberos.kerb.client.request.AsRequest;
import org.apache.kerby.kerberos.kerb.client.request.TgsRequest;
-import org.apache.kerby.kerberos.kerb.spec.ticket.SgtTicket;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import org.apache.kerby.kerberos.kerb.transport.KrbNetwork;
import org.apache.kerby.kerberos.kerb.transport.KrbTransport;
import org.apache.kerby.kerberos.kerb.transport.TransportPair;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/InternalKrbClient.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/InternalKrbClient.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/InternalKrbClient.java
index 68534fb..fd56184 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/InternalKrbClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/InternalKrbClient.java
@@ -22,8 +22,8 @@ package org.apache.kerby.kerberos.kerb.client.impl;
import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.KrbSetting;
-import org.apache.kerby.kerberos.kerb.spec.ticket.SgtTicket;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
/**
* An internal krb client interface.
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/AbstractPreauthPlugin.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/AbstractPreauthPlugin.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/AbstractPreauthPlugin.java
index 0c2ae35..da6e4ba 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/AbstractPreauthPlugin.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/AbstractPreauthPlugin.java
@@ -27,10 +27,10 @@ import org.apache.kerby.kerberos.kerb.preauth.PaFlags;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
import org.apache.kerby.kerberos.kerb.preauth.PreauthPluginMeta;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
import java.util.Collections;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbFastRequestState.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbFastRequestState.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbFastRequestState.java
index 5db3d5e..655dedd 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbFastRequestState.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbFastRequestState.java
@@ -19,10 +19,10 @@
*/
package org.apache.kerby.kerberos.kerb.client.preauth;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.fast.FastOptions;
-import org.apache.kerby.kerberos.kerb.spec.fast.KrbFastArmor;
-import org.apache.kerby.kerberos.kerb.spec.kdc.KdcReq;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.fast.FastOptions;
+import org.apache.kerby.kerberos.kerb.type.fast.KrbFastArmor;
+import org.apache.kerby.kerberos.kerb.type.kdc.KdcReq;
/**
* Maintaining FAST processing state in client side per request.
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbPreauth.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbPreauth.java
index 1fd36c8..521c595 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbPreauth.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/KrbPreauth.java
@@ -26,10 +26,10 @@ import org.apache.kerby.kerberos.kerb.preauth.PaFlags;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
import org.apache.kerby.kerberos.kerb.preauth.PreauthPluginMeta;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthContext.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthContext.java
index 63c59ab..d5fa43b 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthContext.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthContext.java
@@ -20,8 +20,8 @@
package org.apache.kerby.kerberos.kerb.client.preauth;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandle.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandle.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandle.java
index b822dc7..d7a8cec 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandle.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandle.java
@@ -24,9 +24,9 @@ import org.apache.kerby.kerberos.kerb.client.request.KdcRequest;
import org.apache.kerby.kerberos.kerb.preauth.PaFlags;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
public class PreauthHandle {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandler.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandler.java
index 7494a5c..fcd2d07 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandler.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/PreauthHandler.java
@@ -27,9 +27,9 @@ import org.apache.kerby.kerberos.kerb.client.preauth.pkinit.PkinitPreauth;
import org.apache.kerby.kerberos.kerb.client.preauth.token.TokenPreauth;
import org.apache.kerby.kerberos.kerb.client.request.KdcRequest;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/EncTsPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/EncTsPreauth.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/EncTsPreauth.java
index 8f13352..e25f360 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/EncTsPreauth.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/EncTsPreauth.java
@@ -27,12 +27,12 @@ import org.apache.kerby.kerberos.kerb.preauth.PaFlags;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
import org.apache.kerby.kerberos.kerb.preauth.builtin.EncTsPreauthMeta;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptedData;
-import org.apache.kerby.kerberos.kerb.spec.base.KeyUsage;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaEncTsEnc;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptedData;
+import org.apache.kerby.kerberos.kerb.type.base.KeyUsage;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaEncTsEnc;
public class EncTsPreauth extends AbstractPreauthPlugin {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/TgtPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/TgtPreauth.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/TgtPreauth.java
index 6b1118a..a01ce88 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/TgtPreauth.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/builtin/TgtPreauth.java
@@ -25,9 +25,9 @@ import org.apache.kerby.kerberos.kerb.client.request.KdcRequest;
import org.apache.kerby.kerberos.kerb.client.request.TgsRequestWithTgt;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
import org.apache.kerby.kerberos.kerb.preauth.builtin.TgtPreauthMeta;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
public class TgtPreauth extends AbstractPreauthPlugin {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
index 0a69a04..a1f2886 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitPreauth.java
@@ -30,18 +30,18 @@ import org.apache.kerby.kerberos.kerb.preauth.PaFlags;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
import org.apache.kerby.kerberos.kerb.preauth.pkinit.PkinitIdenity;
import org.apache.kerby.kerberos.kerb.preauth.pkinit.PkinitPreauthMeta;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
-import org.apache.kerby.kerberos.kerb.spec.pa.pkinit.AuthPack;
-import org.apache.kerby.kerberos.kerb.spec.pa.pkinit.DHNonce;
-import org.apache.kerby.kerberos.kerb.spec.pa.pkinit.PaPkAsReq;
-import org.apache.kerby.kerberos.kerb.spec.pa.pkinit.PkAuthenticator;
-import org.apache.kerby.kerberos.kerb.spec.pa.pkinit.TrustedCertifiers;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.pkinit.AuthPack;
+import org.apache.kerby.kerberos.kerb.type.pa.pkinit.DHNonce;
+import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PaPkAsReq;
+import org.apache.kerby.kerberos.kerb.type.pa.pkinit.PkAuthenticator;
+import org.apache.kerby.kerberos.kerb.type.pa.pkinit.TrustedCertifiers;
import org.apache.kerby.x509.type.SubjectPublicKeyInfo;
@SuppressWarnings("PMD")
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitRequestContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitRequestContext.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitRequestContext.java
index bfbf7f2..05eaf36 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitRequestContext.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/pkinit/PkinitRequestContext.java
@@ -22,7 +22,7 @@ package org.apache.kerby.kerberos.kerb.client.preauth.pkinit;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
import org.apache.kerby.kerberos.kerb.preauth.pkinit.IdentityOpts;
import org.apache.kerby.kerberos.kerb.preauth.pkinit.PluginOpts;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
public class PkinitRequestContext implements PluginRequestContext {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenContext.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenContext.java
index 59b38d4..637ec59 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenContext.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenContext.java
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.client.preauth.token;
-import org.apache.kerby.kerberos.kerb.spec.base.AuthToken;
+import org.apache.kerby.kerberos.kerb.type.base.AuthToken;
public class TokenContext {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java
index 11aa0a2..274f645 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenPreauth.java
@@ -31,16 +31,16 @@ import org.apache.kerby.kerberos.kerb.preauth.PaFlag;
import org.apache.kerby.kerberos.kerb.preauth.PaFlags;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
import org.apache.kerby.kerberos.kerb.preauth.token.TokenPreauthMeta;
-import org.apache.kerby.kerberos.kerb.spec.base.AuthToken;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptedData;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
-import org.apache.kerby.kerberos.kerb.spec.base.KeyUsage;
-import org.apache.kerby.kerberos.kerb.spec.base.KrbToken;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaData;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
-import org.apache.kerby.kerberos.kerb.spec.pa.token.PaTokenRequest;
-import org.apache.kerby.kerberos.kerb.spec.pa.token.TokenInfo;
+import org.apache.kerby.kerberos.kerb.type.base.AuthToken;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptedData;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.base.KeyUsage;
+import org.apache.kerby.kerberos.kerb.type.base.KrbToken;
+import org.apache.kerby.kerberos.kerb.type.pa.PaData;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.token.PaTokenRequest;
+import org.apache.kerby.kerberos.kerb.type.pa.token.TokenInfo;
import java.util.Collections;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenRequestContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenRequestContext.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenRequestContext.java
index ca7eb87..c9b20bd 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenRequestContext.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/preauth/token/TokenRequestContext.java
@@ -20,7 +20,7 @@
package org.apache.kerby.kerberos.kerb.client.preauth.token;
import org.apache.kerby.kerberos.kerb.preauth.PluginRequestContext;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
public class TokenRequestContext implements PluginRequestContext {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredAsRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredAsRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredAsRequest.java
index c3960ba..ec815df 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredAsRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredAsRequest.java
@@ -22,7 +22,7 @@ package org.apache.kerby.kerberos.kerb.client.request;
import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.KrbContext;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
/**
* This initiates an armor protected AS-REQ using FAST/Pre-auth.
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredRequest.java
index 3fb5683..9bb011b 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredRequest.java
@@ -29,26 +29,26 @@ import org.apache.kerby.kerberos.kerb.common.CheckSumUtil;
import org.apache.kerby.kerberos.kerb.common.EncryptionUtil;
import org.apache.kerby.kerberos.kerb.crypto.EncryptionHandler;
import org.apache.kerby.kerberos.kerb.crypto.fast.FastUtil;
-import org.apache.kerby.kerberos.kerb.spec.KerberosTime;
-import org.apache.kerby.kerberos.kerb.spec.ap.ApOptions;
-import org.apache.kerby.kerberos.kerb.spec.ap.ApReq;
-import org.apache.kerby.kerberos.kerb.spec.ap.Authenticator;
-import org.apache.kerby.kerberos.kerb.spec.base.CheckSum;
-import org.apache.kerby.kerberos.kerb.spec.base.CheckSumType;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptedData;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionType;
-import org.apache.kerby.kerberos.kerb.spec.base.KeyUsage;
-import org.apache.kerby.kerberos.kerb.spec.fast.ArmorType;
-import org.apache.kerby.kerberos.kerb.spec.fast.KrbFastArmor;
-import org.apache.kerby.kerberos.kerb.spec.fast.KrbFastArmoredReq;
-import org.apache.kerby.kerberos.kerb.spec.fast.KrbFastReq;
-import org.apache.kerby.kerberos.kerb.spec.kdc.AsReq;
-import org.apache.kerby.kerberos.kerb.spec.kdc.KdcReq;
-import org.apache.kerby.kerberos.kerb.spec.kdc.KdcReqBody;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataEntry;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
-import org.apache.kerby.kerberos.kerb.spec.ticket.Ticket;
+import org.apache.kerby.kerberos.kerb.type.KerberosTime;
+import org.apache.kerby.kerberos.kerb.type.ap.ApOptions;
+import org.apache.kerby.kerberos.kerb.type.ap.ApReq;
+import org.apache.kerby.kerberos.kerb.type.ap.Authenticator;
+import org.apache.kerby.kerberos.kerb.type.base.CheckSum;
+import org.apache.kerby.kerberos.kerb.type.base.CheckSumType;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptedData;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
+import org.apache.kerby.kerberos.kerb.type.base.KeyUsage;
+import org.apache.kerby.kerberos.kerb.type.fast.ArmorType;
+import org.apache.kerby.kerberos.kerb.type.fast.KrbFastArmor;
+import org.apache.kerby.kerberos.kerb.type.fast.KrbFastArmoredReq;
+import org.apache.kerby.kerberos.kerb.type.fast.KrbFastReq;
+import org.apache.kerby.kerberos.kerb.type.kdc.AsReq;
+import org.apache.kerby.kerberos.kerb.type.kdc.KdcReq;
+import org.apache.kerby.kerberos.kerb.type.kdc.KdcReqBody;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataEntry;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.ticket.Ticket;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredTgsRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredTgsRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredTgsRequest.java
index 367f093..e204e04 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredTgsRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/ArmoredTgsRequest.java
@@ -22,7 +22,7 @@ package org.apache.kerby.kerberos.kerb.client.request;
import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.KrbContext;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
public class ArmoredTgsRequest extends TgsRequest {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequest.java
index deb07d5..473d76e 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequest.java
@@ -25,17 +25,17 @@ import org.apache.kerby.kerberos.kerb.ccache.CredentialCache;
import org.apache.kerby.kerberos.kerb.client.KrbContext;
import org.apache.kerby.kerberos.kerb.client.KrbOption;
import org.apache.kerby.kerberos.kerb.common.KrbUtil;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.base.HostAddress;
-import org.apache.kerby.kerberos.kerb.spec.base.HostAddresses;
-import org.apache.kerby.kerberos.kerb.spec.base.KeyUsage;
-import org.apache.kerby.kerberos.kerb.spec.base.PrincipalName;
-import org.apache.kerby.kerberos.kerb.spec.kdc.AsReq;
-import org.apache.kerby.kerberos.kerb.spec.kdc.EncAsRepPart;
-import org.apache.kerby.kerberos.kerb.spec.kdc.EncKdcRepPart;
-import org.apache.kerby.kerberos.kerb.spec.kdc.KdcRep;
-import org.apache.kerby.kerberos.kerb.spec.kdc.KdcReqBody;
-import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.base.HostAddress;
+import org.apache.kerby.kerberos.kerb.type.base.HostAddresses;
+import org.apache.kerby.kerberos.kerb.type.base.KeyUsage;
+import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
+import org.apache.kerby.kerberos.kerb.type.kdc.AsReq;
+import org.apache.kerby.kerberos.kerb.type.kdc.EncAsRepPart;
+import org.apache.kerby.kerberos.kerb.type.kdc.EncKdcRepPart;
+import org.apache.kerby.kerberos.kerb.type.kdc.KdcRep;
+import org.apache.kerby.kerberos.kerb.type.kdc.KdcReqBody;
+import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithCert.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithCert.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithCert.java
index ef2808f..52a0f38 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithCert.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithCert.java
@@ -23,7 +23,7 @@ import org.apache.kerby.kerberos.kerb.client.KrbContext;
import org.apache.kerby.kerberos.kerb.client.KrbOption;
import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
public class AsRequestWithCert extends AsRequest {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java
index f6a191c..c71d096 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithKeytab.java
@@ -24,8 +24,8 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.KrbContext;
import org.apache.kerby.kerberos.kerb.client.KrbOption;
import org.apache.kerby.kerberos.kerb.keytab.Keytab;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8483322e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithPasswd.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithPasswd.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithPasswd.java
index b5e044e..0d73193 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithPasswd.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/AsRequestWithPasswd.java
@@ -23,8 +23,8 @@ import org.apache.kerby.kerberos.kerb.client.KrbContext;
import org.apache.kerby.kerberos.kerb.client.KrbOption;
import org.apache.kerby.kerberos.kerb.crypto.EncryptionHandler;
import org.apache.kerby.kerberos.kerb.KrbException;
-import org.apache.kerby.kerberos.kerb.spec.base.EncryptionKey;
-import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
+import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
+import org.apache.kerby.kerberos.kerb.type.pa.PaDataType;
public class AsRequestWithPasswd extends AsRequest {