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/01/22 02:31:47 UTC
directory-kerberos git commit: Fixed some building issues
Repository: directory-kerberos
Updated Branches:
refs/heads/newlayout 7d9261af4 -> ee241a684
Fixed some building issues
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/ee241a68
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/ee241a68
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/ee241a68
Branch: refs/heads/newlayout
Commit: ee241a684591ed9a5bba3c5b395783e6708d736a
Parents: 7d9261a
Author: Drankye <dr...@gmail.com>
Authored: Thu Jan 22 17:28:46 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Thu Jan 22 17:28:46 2015 +0800
----------------------------------------------------------------------
kerby-kdc/pom.xml | 2 +-
.../kerberos/kdc/server/ApacheKdcServer.java | 2 +-
.../apache/kerby/kerberos/kdc/server/KdcTest.java | 2 +-
.../kerby/kerberos/kerb/client/KrbClient.java | 18 +++++++++---------
.../kerby/kerberos/kerb/client/KrbConfig.java | 2 +-
.../kerby/kerberos/kerb/client/KrbHandler.java | 12 ++++++------
.../kerb/client/event/KrbClientEvent.java | 2 +-
.../kerb/client/event/KrbClientEventType.java | 2 +-
.../kerb/client/preauth/token/TokenContext.java | 2 +-
.../kerb/client/preauth/token/TokenPreauth.java | 2 +-
.../kerberos/kerb/client/request/KdcRequest.java | 2 +-
.../kerberos/kerb/client/TestKrbConfigLoad.java | 2 +-
.../kerby/kerberos/kerb/common/KrbConfHelper.java | 4 ++--
.../kerberos/kerb/common/KrbStreamingDecoder.java | 4 ++--
.../kerby/kerberos/kerb/common/KrbUtil.java | 2 +-
.../kerberos/kerb/common/SectionConfigKey.java | 2 +-
.../kerberos/kerb/crypto/CamelliaEncTest.java | 2 +-
.../kerby/kerberos/kerb/crypto/CheckSumTest.java | 2 +-
.../kerby/kerberos/kerb/crypto/CheckSumsTest.java | 2 +-
.../kerby/kerberos/kerb/crypto/CmacTest.java | 2 +-
.../kerby/kerberos/kerb/crypto/Crc32Test.java | 2 +-
.../kerberos/kerb/crypto/DecryptionTest.java | 2 +-
.../kerberos/kerb/crypto/DesKeyMakerTest.java | 2 +-
.../kerby/kerberos/kerb/crypto/KeyDeriveTest.java | 2 +-
.../kerberos/kerb/crypto/String2keyTest.java | 2 +-
.../kerberos/kerb/server/WithCertKdcTest.java | 2 +-
.../kerberos/kerb/server/WithTokenKdcTest.java | 2 +-
.../kerby/kerberos/kerb/server/KdcConfig.java | 2 +-
.../kerby/kerberos/kerb/server/KdcHandler.java | 8 ++++----
.../kerby/kerberos/kerb/server/KdcServer.java | 4 ++--
.../kerberos/kerb/server/TestKdcConfigLoad.java | 2 +-
.../java/org/apache/kerby/transport/Network.java | 1 -
32 files changed, 50 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc/pom.xml b/kerby-kdc/pom.xml
index a353f86..7052a13 100644
--- a/kerby-kdc/pom.xml
+++ b/kerby-kdc/pom.xml
@@ -21,7 +21,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>kerby-KDC</artifactId>
+ <artifactId>kerby-kdc</artifactId>
<name>Kerby KDC Server</name>
<description>Kerby KDC Server</description>
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/ApacheKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/ApacheKdcServer.java b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/ApacheKdcServer.java
index 3cb7ff4..7734d18 100644
--- a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/ApacheKdcServer.java
+++ b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/server/ApacheKdcServer.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package main.java.org.apache.kerby.kerberos.kdc.server;
+package org.apache.kerby.kerberos.kdc.server;
import org.apache.kerby.kerberos.kdc.identitybackend.LdapIdentityBackend;
import org.apache.kerby.kerberos.kerb.identity.IdentityService;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kdc/src/test/java/org/apache/kerby/kerberos/kdc/server/KdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kdc/src/test/java/org/apache/kerby/kerberos/kdc/server/KdcTest.java b/kerby-kdc/src/test/java/org/apache/kerby/kerberos/kdc/server/KdcTest.java
index f028657..e124e17 100644
--- a/kerby-kdc/src/test/java/org/apache/kerby/kerberos/kdc/server/KdcTest.java
+++ b/kerby-kdc/src/test/java/org/apache/kerby/kerberos/kdc/server/KdcTest.java
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package test.java.org.apache.kerby.kerberos.kdc.server;
+package org.apache.kerby.kerberos.kdc.server;
import org.junit.After;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/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 e3bca5b..55e9b60 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
@@ -19,9 +19,9 @@
*/
package org.apache.kerby.kerberos.kerb.client;
-import org.apache.haox.event.Event;
-import org.apache.haox.event.EventHub;
-import org.apache.haox.event.EventWaiter;
+import org.apache.kerby.event.Event;
+import org.apache.kerby.event.EventHub;
+import org.apache.kerby.event.EventWaiter;
import org.apache.kerby.kerberos.kerb.KrbErrorCode;
import org.apache.kerby.kerberos.kerb.client.event.KrbClientEvent;
import org.apache.kerby.kerberos.kerb.client.event.KrbClientEventType;
@@ -34,12 +34,12 @@ import org.apache.kerby.kerberos.kerb.spec.common.KrbError;
import org.apache.kerby.kerberos.kerb.spec.common.PrincipalName;
import org.apache.kerby.kerberos.kerb.spec.ticket.ServiceTicket;
import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
-import org.haox.token.KerbToken;
-import org.apache.haox.transport.Connector;
-import org.apache.haox.transport.Transport;
-import org.apache.haox.transport.event.TransportEvent;
-import org.apache.haox.transport.event.TransportEventType;
-import org.apache.haox.transport.tcp.TcpConnector;
+import org.apache.kerby.token.KerbToken;
+import org.apache.kerby.transport.Connector;
+import org.apache.kerby.transport.Transport;
+import org.apache.kerby.transport.event.TransportEvent;
+import org.apache.kerby.transport.event.TransportEventType;
+import org.apache.kerby.transport.tcp.TcpConnector;
import java.io.IOException;
import java.security.PrivateKey;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/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 57daf19..e523c12 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
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.client;
-import org.apache.haox.config.Conf;
+import org.apache.kerby.config.Conf;
import org.apache.kerby.kerberos.kerb.common.KrbConfHelper;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/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 c898d80..085ee57 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
@@ -19,9 +19,9 @@
*/
package org.apache.kerby.kerberos.kerb.client;
-import org.apache.haox.event.AbstractEventHandler;
-import org.apache.haox.event.Event;
-import org.apache.haox.event.EventType;
+import org.apache.kerby.event.AbstractEventHandler;
+import org.apache.kerby.event.Event;
+import org.apache.kerby.event.EventType;
import org.apache.kerby.kerberos.kerb.client.event.KrbClientEvent;
import org.apache.kerby.kerberos.kerb.client.event.KrbClientEventType;
import org.apache.kerby.kerberos.kerb.client.preauth.PreauthHandler;
@@ -34,9 +34,9 @@ import org.apache.kerby.kerberos.kerb.spec.common.KrbMessage;
import org.apache.kerby.kerberos.kerb.spec.common.KrbMessageType;
import org.apache.kerby.kerberos.kerb.spec.kdc.KdcRep;
import org.apache.kerby.kerberos.kerb.spec.kdc.KdcReq;
-import org.apache.haox.transport.Transport;
-import org.apache.haox.transport.event.MessageEvent;
-import org.apache.haox.transport.event.TransportEventType;
+import org.apache.kerby.transport.Transport;
+import org.apache.kerby.transport.event.MessageEvent;
+import org.apache.kerby.transport.event.TransportEventType;
import java.nio.ByteBuffer;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEvent.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEvent.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEvent.java
index acb4571..291b33e 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEvent.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEvent.java
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.client.event;
-import org.apache.haox.event.Event;
+import org.apache.kerby.event.Event;
import org.apache.kerby.kerberos.kerb.client.request.AsRequest;
import org.apache.kerby.kerberos.kerb.client.request.TgsRequest;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEventType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEventType.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEventType.java
index 111585a..78fd424 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEventType.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/event/KrbClientEventType.java
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.client.event;
-import org.apache.haox.event.EventType;
+import org.apache.kerby.event.EventType;
public enum KrbClientEventType implements EventType {
TGT_INTENT,
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/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 8763cd5..e1696dc 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.haox.token.KerbToken;
+import org.apache.kerby.token.KerbToken;
public class TokenContext {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/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 eebb09c..f67ad71 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
@@ -33,7 +33,7 @@ import org.apache.kerby.kerberos.kerb.spec.common.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.haox.token.KerbToken;
+import org.apache.kerby.token.KerbToken;
import java.util.Collections;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
index 3ec5d65..bbbadab 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
@@ -33,7 +33,7 @@ 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.kdc.KdcReqBody;
import org.apache.kerby.kerberos.kerb.spec.pa.PaDataType;
-import org.apache.haox.transport.Transport;
+import org.apache.kerby.transport.Transport;
import java.net.InetAddress;
import java.net.UnknownHostException;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java
index 848efcb..b766c48 100644
--- a/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java
+++ b/kerby-kerb/kerb-client/src/test/java/org/apache/kerby/kerberos/kerb/client/TestKrbConfigLoad.java
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.client;
-import org.apache.haox.config.Conf;
+import org.apache.kerby.config.Conf;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java
index 4454af1..0100b0b 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbConfHelper.java
@@ -20,8 +20,8 @@
*/
package org.apache.kerby.kerberos.kerb.common;
-import org.apache.haox.config.Conf;
-import org.apache.haox.config.Config;
+import org.apache.kerby.config.Conf;
+import org.apache.kerby.config.Config;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbStreamingDecoder.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbStreamingDecoder.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbStreamingDecoder.java
index f769e69..82015ee 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbStreamingDecoder.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbStreamingDecoder.java
@@ -19,8 +19,8 @@
*/
package org.apache.kerby.kerberos.kerb.common;
-import org.apache.haox.transport.tcp.DecodingCallback;
-import org.apache.haox.transport.tcp.StreamingDecoder;
+import org.apache.kerby.transport.tcp.DecodingCallback;
+import org.apache.kerby.transport.tcp.StreamingDecoder;
import java.nio.ByteBuffer;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbUtil.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbUtil.java
index 26986a3..77e9d56 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbUtil.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/KrbUtil.java
@@ -21,7 +21,7 @@ package org.apache.kerby.kerberos.kerb.common;
import org.apache.kerby.kerberos.kerb.codec.KrbCodec;
import org.apache.kerby.kerberos.kerb.spec.common.KrbMessage;
-import org.apache.haox.transport.Transport;
+import org.apache.kerby.transport.Transport;
import java.io.IOException;
import java.nio.ByteBuffer;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/SectionConfigKey.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/SectionConfigKey.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/SectionConfigKey.java
index c2ccc82..1dc83bf 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/SectionConfigKey.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/common/SectionConfigKey.java
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.common;
-import org.apache.haox.config.ConfigKey;
+import org.apache.kerby.config.ConfigKey;
/**
* Config Keys with section name.
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java
index 4088c97..3a7ffe9 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CamelliaEncTest.java
@@ -23,7 +23,7 @@ import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.crypto.enc.EncryptProvider;
import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia128Provider;
import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia256Provider;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
index 61c2101..c47d9d4 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumTest.java
@@ -20,7 +20,7 @@
package org.apache.kerby.kerberos.kerb.crypto;
import org.apache.kerby.kerberos.kerb.spec.common.*;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Test;
/**
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
index a9e38bb..3b21e7a 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CheckSumsTest.java
@@ -23,7 +23,7 @@ import org.apache.kerby.kerberos.kerb.spec.common.CheckSum;
import org.apache.kerby.kerberos.kerb.spec.common.CheckSumType;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
import org.apache.kerby.kerberos.kerb.spec.common.KeyUsage;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Test;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java
index 0364810..049b578 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/CmacTest.java
@@ -22,7 +22,7 @@ package org.apache.kerby.kerberos.kerb.crypto;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.crypto.enc.EncryptProvider;
import org.apache.kerby.kerberos.kerb.crypto.enc.provider.Camellia128Provider;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java
index c15fd26..59879d7 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/Crc32Test.java
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.crypto;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java
index 76a91ee..8d0c5ca 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DecryptionTest.java
@@ -22,7 +22,7 @@ package org.apache.kerby.kerberos.kerb.crypto;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionKey;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
import org.apache.kerby.kerberos.kerb.spec.common.KeyUsage;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
index 95a1827..0c5f9c2 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/DesKeyMakerTest.java
@@ -1,7 +1,7 @@
package org.apache.kerby.kerberos.kerb.crypto;
import org.apache.kerby.kerberos.kerb.crypto.key.DesKeyMaker;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Assert;
/**
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
index a9105fd..eb04804 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/KeyDeriveTest.java
@@ -25,7 +25,7 @@ import org.apache.kerby.kerberos.kerb.crypto.key.CamelliaKeyMaker;
import org.apache.kerby.kerberos.kerb.crypto.key.Des3KeyMaker;
import org.apache.kerby.kerberos.kerb.crypto.key.DkKeyMaker;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java
index d8377d8..192a614 100644
--- a/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java
+++ b/kerby-kerb/kerb-crypto/src/test/java/org/apache/kerby/kerberos/kerb/crypto/String2keyTest.java
@@ -21,7 +21,7 @@ package org.apache.kerby.kerberos.kerb.crypto;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionKey;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
-import org.haox.util.HexUtil;
+import org.apache.kerby.util.HexUtil;
import org.junit.Test;
import java.nio.charset.StandardCharsets;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java
index 3986005..cad84e1 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithCertKdcTest.java
@@ -22,7 +22,7 @@ package org.apache.kerby.kerberos.kerb.server;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.spec.ticket.ServiceTicket;
import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
-import org.haox.pki.Pkix;
+import org.apache.kerby.pki.Pkix;
import org.junit.Assert;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java
index 1bad71d..805d0c7 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/WithTokenKdcTest.java
@@ -22,7 +22,7 @@ package org.apache.kerby.kerberos.kerb.server;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.spec.ticket.ServiceTicket;
import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
-import org.haox.token.KerbToken;
+import org.apache.kerby.token.KerbToken;
import org.junit.Assert;
public class WithTokenKdcTest extends KdcTestBase {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
index aeca837..78ece6c 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.server;
-import org.apache.haox.config.Conf;
+import org.apache.kerby.config.Conf;
import org.apache.kerby.kerberos.kerb.common.KrbConfHelper;
import org.apache.kerby.kerberos.kerb.spec.common.EncryptionType;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcHandler.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcHandler.java
index a6e2803..07de64d 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcHandler.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcHandler.java
@@ -32,10 +32,10 @@ import org.apache.kerby.kerberos.kerb.spec.common.KrbMessageType;
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.TgsReq;
-import org.apache.haox.transport.MessageHandler;
-import org.apache.haox.transport.Transport;
-import org.apache.haox.transport.event.MessageEvent;
-import org.apache.haox.transport.tcp.TcpTransport;
+import org.apache.kerby.transport.MessageHandler;
+import org.apache.kerby.transport.Transport;
+import org.apache.kerby.transport.event.MessageEvent;
+import org.apache.kerby.transport.tcp.TcpTransport;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
index b298cf2..74ece70 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
@@ -19,10 +19,10 @@
*/
package org.apache.kerby.kerberos.kerb.server;
-import org.apache.haox.event.EventHub;
+import org.apache.kerby.event.EventHub;
import org.apache.kerby.kerberos.kerb.common.KrbStreamingDecoder;
import org.apache.kerby.kerberos.kerb.identity.IdentityService;
-import org.apache.haox.transport.Network;
+import org.apache.kerby.transport.Network;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java
index 56e0acb..548574f 100644
--- a/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java
+++ b/kerby-kerb/kerb-server/src/test/java/org/apache/kerby/kerberos/kerb/server/TestKdcConfigLoad.java
@@ -19,7 +19,7 @@
*/
package org.apache.kerby.kerberos.kerb.server;
-import org.apache.haox.config.Conf;
+import org.apache.kerby.config.Conf;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/ee241a68/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java
----------------------------------------------------------------------
diff --git a/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java b/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java
index 75f934d..4cf346e 100644
--- a/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java
+++ b/lib/kerby-event/src/main/java/org/apache/kerby/transport/Network.java
@@ -25,7 +25,6 @@ import org.apache.kerby.event.EventType;
import org.apache.kerby.event.LongRunningEventHandler;
import org.apache.kerby.transport.event.AddressEvent;
import org.apache.kerby.transport.event.TransportEvent;
-import org.apache.haox.transport.tcp.*;
import org.apache.kerby.transport.tcp.*;
import org.apache.kerby.transport.udp.UdpAddressEvent;
import org.apache.kerby.transport.udp.UdpEventType;