Hi Emmanuel, I'm sorry I got the master branch messy. Could you help replace the master branch with the dsdev branch? I mean what we really want is the content of the dsdev branch. I'm not good at GIT yet, so please help, thanks.
The following is the current master branch history but not what we want. === [drankye@zkdesk directory-kerberos]$ git log commit 02eae6bab2728aa84b1e13a38b79212762d34b72 Merge: 512e553 23c1fd1 Author: Drankye <[email protected]> Date: Sun Jan 11 09:30:51 2015 +0800 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerberos commit 23c1fd120d770c01b7513849c69badfff8eca8fd Author: drankye <[email protected]> Date: Sun Jan 11 05:26:46 2015 +0800 Initially import Haox codebase (https://github.com/drankye/haox) commit c4dc328ed0fa1f2463645608f904a00c280b50fd Author: Drankye <[email protected]> Date: Sat Jan 10 18:55:10 2015 +0800 Removed the test file commit 449a21a7b95474f433da8179621f96e3b47e4ed4 Author: Drankye <[email protected]> Date: Sat Jan 10 17:59:14 2015 +0800 A test commit 512e5536da1e1ff517a733be10a675e18c41a021 Merge: 58e9006 0e967f5 Author: Drankye <[email protected]> Date: Thu Jan 1 20:00:31 2015 +0800 Merge branch 'master' of https://github.com/drankye/haox commit 58e9006fe3fc7ec18b94fbd33ee6a909e48d5e15 Author: Drankye <[email protected]> Date: Thu Jan 1 19:59:44 2015 +0800 Working on string2key tests and re-implemented des keymaker ... === Below is the history of the dsdev branch, exactly what we want. === [drankye@zkdesk directory-kerberos]$ git log commit 06b2eed151fe5089fa10b7ced07410d78b97ee59 Author: Drankye <[email protected]> Date: Mon Jan 12 21:02:57 2015 +0800 Refactored the decryption test codes some bit and disabled DES related encryption tests for now to make the overall test passed commit 79cc04a0be64c41f1f6b55c0d12f3f30887785a1 Author: Emmanuel Lécharny <[email protected]> Date: Mon Jan 12 08:51:41 2015 +0100 o Added the missing AL 2.0 header o Added the missing Javadoc o Removed useless methods o Split the test so that we have one single unit test per encryption type for a better visualisation of the failures o Removed the useless print to err commit 589a7981f70746e1e08a5f794662643063f15973 Author: Emmanuel Lécharny <[email protected]> Date: Mon Jan 12 00:54:10 2015 +0100 Bumped up to the latest dependencies version; Added properties for some of the dependencies in teh top evel pom; Added some missing plugin commit 23c1fd120d770c01b7513849c69badfff8eca8fd Author: drankye <[email protected]> Date: Sun Jan 11 05:26:46 2015 +0800 Initially import Haox codebase (https://github.com/drankye/haox) commit c4dc328ed0fa1f2463645608f904a00c280b50fd Author: Drankye <[email protected]> Date: Sat Jan 10 18:55:10 2015 +0800 Removed the test file commit 449a21a7b95474f433da8179621f96e3b47e4ed4 Author: Drankye <[email protected]> Date: Sat Jan 10 17:59:14 2015 +0800 === Thanks a lot! Regards, Kai
