You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/09/09 03:36:22 UTC
[01/46] directory-kerby git commit: refine BUILDING
Repository: directory-kerby
Updated Branches:
refs/heads/pkinit-support 53d09c96b -> 00c4515cd
refine BUILDING
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/723f9a71
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/723f9a71
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/723f9a71
Branch: refs/heads/pkinit-support
Commit: 723f9a719f6a0dc9f6a8efe97eb6e3a1331f96cb
Parents: 793201d
Author: yaning <hi...@sjtu.edu.cn>
Authored: Thu Aug 20 15:00:21 2015 +0800
Committer: yaning <hi...@sjtu.edu.cn>
Committed: Thu Aug 20 15:00:21 2015 +0800
----------------------------------------------------------------------
BUILDING.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/723f9a71/BUILDING.txt
----------------------------------------------------------------------
diff --git a/BUILDING.txt b/BUILDING.txt
index 35d041a..99f14a4 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -1,5 +1,5 @@
#Build instructions for Kerby
--------------
+----------------
###Requirements:
* JDK 1.7+
* Maven 3.0 or later
@@ -28,4 +28,4 @@ It should be run at the top directory of Kerby.
(tar package in /kerby/kerby-dist/kdc-dist/target/ & /kerby/kerby-dist/tool-dist/target/)
* Generate javadoc without running tests: mvn clean package -DskipTests javadoc:javadoc
* Checkstyle & PMD checks are run by default. To build quickly and prevent them from running,
- add option [-Pnochecks], for example, mvn package -Pnochecks
\ No newline at end of file
+ add option [-Pnochecks], for example, mvn package -Pnochecks
[30/46] directory-kerby git commit: add JavaDoc for kerb-admin module
Posted by pl...@apache.org.
add JavaDoc for kerb-admin module
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/e0dd5031
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/e0dd5031
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/e0dd5031
Branch: refs/heads/pkinit-support
Commit: e0dd5031d923e8f1c40b2f97f0bb8b4ec669a585
Parents: c6a6674
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 15:11:55 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 15:11:55 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/admin/Kadmin.java | 45 +++++++++++++-------
1 file changed, 30 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e0dd5031/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 35b9090..285544f 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
@@ -56,6 +56,7 @@ public class Kadmin {
/**
* Construct with prepared KdcConfig and BackendConfig.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
* @param kdcConfig The kdc config
* @param backendConfig The backend config
*/
@@ -68,6 +69,7 @@ public class Kadmin {
/**
* Construct with prepared conf dir.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e;
* @param confDir The path of conf dir
*/
public Kadmin(File confDir) throws KrbException {
@@ -117,6 +119,7 @@ public class Kadmin {
/**
* Check the built-in principals, will throw KrbException if not exist.
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
*/
public void checkBuiltinPrincipals() throws KrbException {
String tgsPrincipal = getTgsPrincipal();
@@ -132,6 +135,7 @@ public class Kadmin {
/**
* Create build-in principals.
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
*/
public void createBuiltinPrincipals() throws KrbException {
String tgsPrincipal = getTgsPrincipal();
@@ -155,6 +159,7 @@ public class Kadmin {
/**
* Delete build-in principals.
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
*/
public void deleteBuiltinPrincipals() throws KrbException {
deletePrincipal(getTgsPrincipal());
@@ -191,6 +196,7 @@ public class Kadmin {
/**
* Add principal to backend.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
* @param principal The principal to be added into backend
*/
public void addPrincipal(String principal) throws KrbException {
@@ -201,6 +207,7 @@ public class Kadmin {
/**
* Add principal to backend.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
* @param principal The principal to be added into backend
* @param kOptions The KOptions with principal info
*/
@@ -217,6 +224,7 @@ public class Kadmin {
/**
* Add principal to backend.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
* @param principal The principal to be added into backend
* @param password The password to create encryption key
*/
@@ -229,6 +237,7 @@ public class Kadmin {
/**
* Add principal to backend.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
* @param principal The principal to be added into backend
* @param password The password to create encryption key
* @param kOptions The KOptions with principal info
@@ -249,7 +258,7 @@ public class Kadmin {
*
* @param keytabFile The keytab file
* @param principal The principal name
- * @throws KrbException
+ * @throws KrbException e
*/
public void exportKeytab(File keytabFile, String principal)
throws KrbException {
@@ -265,7 +274,7 @@ public class Kadmin {
*
* @param keytabFile The keytab file
* @param principals The principal names
- * @throws KrbException
+ * @throws KrbException e
*/
public void exportKeytab(File keytabFile, List<String> principals)
throws KrbException {
@@ -287,7 +296,7 @@ public class Kadmin {
* Export all identity keys to the specified keytab file.
*
* @param keytabFile The keytab file
- * @throws KrbException
+ * @throws KrbException e
*/
public void exportKeytab(File keytabFile) throws KrbException {
Keytab keytab = AdminHelper.createOrLoadKeytab(keytabFile);
@@ -309,7 +318,7 @@ public class Kadmin {
*
* @param keytabFile The keytab file
* @param principal The principal name
- * @throws KrbException
+ * @throws KrbException e
*/
public void removeKeytabEntriesOf(File keytabFile, String principal)
throws KrbException {
@@ -324,7 +333,7 @@ public class Kadmin {
* @param keytabFile The keytab file
* @param principal The principal name
* @param kvno The kvno
- * @throws KrbException
+ * @throws KrbException e
*/
public void removeKeytabEntriesOf(File keytabFile, String principal, int kvno)
throws KrbException {
@@ -338,7 +347,7 @@ public class Kadmin {
*
* @param keytabFile The keytab file
* @param principal The principal name
- * @throws KrbException
+ * @throws KrbException e
*/
public void removeOldKeytabEntriesOf(File keytabFile, String principal)
throws KrbException {
@@ -350,7 +359,7 @@ public class Kadmin {
* Delete the principal in backend.
*
* @param principal The principal to be deleted from backend
- * @throws KrbException
+ * @throws KrbException e
*/
public void deletePrincipal(String principal) throws KrbException {
principal = fixPrincipal(principal);
@@ -362,7 +371,7 @@ public class Kadmin {
*
* @param principal The principal to be modified
* @param kOptions The KOptions with changed principal info
- * @throws KrbException
+ * @throws KrbException e
*/
public void modifyPrincipal(String principal, KOptions kOptions)
throws KrbException {
@@ -381,7 +390,7 @@ public class Kadmin {
*
* @param oldPrincipalName The original principal name
* @param newPrincipalName The new principal name
- * @throws KrbException
+ * @throws KrbException e
*/
public void renamePrincipal(String oldPrincipalName, String newPrincipalName)
throws KrbException {
@@ -408,7 +417,8 @@ public class Kadmin {
* Get the identity from backend.
*
* @param principalName The principal name
- * @throws KrbException
+ * @throws KrbException e
+ * @return identity
*/
public KrbIdentity getPrincipal(String principalName) throws KrbException {
KrbIdentity identity = backend.getIdentity(principalName);
@@ -418,7 +428,8 @@ public class Kadmin {
/**
* Get all the principal names from backend.
*
- * @throws KrbException
+ * @throws KrbException e
+ * @return principal list
*/
public List<String> getPrincipals() throws KrbException {
Iterable<String> principalNames = backend.getIdentities();
@@ -434,7 +445,8 @@ public class Kadmin {
* Get all the Pattern for matching from glob string. The glob string can contain "." "*" and "[]"
*
* @param globString The glob string for matching
- * @throws KrbException
+ * @throws KrbException e
+ * @return pattern
*/
public Pattern getPatternFromGlobPatternString(String globString) throws KrbException
{
@@ -463,7 +475,8 @@ public class Kadmin {
* Get all the principal names that meets the pattern
*
* @param pt The pattern for matching
- * @throws KrbException
+ * @throws KrbException e
+ * @return Principal names
*/
public List<String> getPrincipalNamesByPattern(Pattern pt) throws KrbException {
if (pt == null) {
@@ -489,7 +502,7 @@ public class Kadmin {
*
* @param principal The principal to be updated password
* @param password The new password
- * @throws KrbException
+ * @throws KrbException e
*/
public void updatePassword(String principal, String password)
throws KrbException {
@@ -510,7 +523,7 @@ public class Kadmin {
* Update the random keys of specified principal.
*
* @param principal The principal to be updated keys
- * @throws KrbException
+ * @throws KrbException e
*/
public void updateKeys(String principal) throws KrbException {
principal = fixPrincipal(principal);
@@ -527,6 +540,8 @@ public class Kadmin {
/**
* Stop the backend and release any resources associated.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
public void release() throws KrbException {
if (backend != null) {
[40/46] directory-kerby git commit: [maven-release-plugin] prepare
release kerby-all-1.0.0-RC1
Posted by pl...@apache.org.
[maven-release-plugin] prepare release kerby-all-1.0.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/c49e9d47
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/c49e9d47
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/c49e9d47
Branch: refs/heads/pkinit-support
Commit: c49e9d4706c4e97059b6d4dc1392da050e695465
Parents: 1ba1204
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Sep 5 11:41:12 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Sep 5 11:41:12 2015 +0200
----------------------------------------------------------------------
benchmark/pom.xml | 2 +-
kerby-asn1/pom.xml | 6 ++----
kerby-backend/json-backend/pom.xml | 2 +-
kerby-backend/ldap-backend/pom.xml | 2 +-
kerby-backend/mavibot-backend/pom.xml | 5 ++---
kerby-backend/pom.xml | 2 +-
kerby-backend/zookeeper-backend/pom.xml | 4 ++--
kerby-config/pom.xml | 6 ++----
kerby-dist/kdc-dist/pom.xml | 4 ++--
kerby-dist/pom.xml | 6 ++----
kerby-dist/tool-dist/pom.xml | 4 ++--
kerby-kdc-test/pom.xml | 4 ++--
kerby-kdc/pom.xml | 4 ++--
kerby-kerb/integration-test/pom.xml | 2 +-
kerby-kerb/kerb-admin/pom.xml | 2 +-
kerby-kerb/kerb-client-api-all/pom.xml | 2 +-
kerby-kerb/kerb-client/pom.xml | 2 +-
kerby-kerb/kerb-common/pom.xml | 2 +-
kerby-kerb/kerb-core-test/pom.xml | 2 +-
kerby-kerb/kerb-core/pom.xml | 2 +-
kerby-kerb/kerb-crypto/pom.xml | 2 +-
kerby-kerb/kerb-identity-test/pom.xml | 2 +-
kerby-kerb/kerb-identity/pom.xml | 2 +-
kerby-kerb/kerb-kdc-test/pom.xml | 2 +-
kerby-kerb/kerb-server-api-all/pom.xml | 2 +-
kerby-kerb/kerb-server/pom.xml | 4 ++--
kerby-kerb/kerb-simplekdc/pom.xml | 2 +-
kerby-kerb/kerb-util/pom.xml | 2 +-
kerby-kerb/pom.xml | 4 ++--
kerby-provider/pom.xml | 6 ++----
kerby-provider/token-provider/pom.xml | 6 ++----
kerby-tool/client-tool/pom.xml | 4 ++--
kerby-tool/kdc-tool/pom.xml | 2 +-
kerby-tool/pom.xml | 2 +-
kerby-util/pom.xml | 2 +-
pom.xml | 8 ++++----
36 files changed, 53 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 1fa8cc4..cac3d86 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>kerby-all</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-asn1/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-asn1/pom.xml b/kerby-asn1/pom.xml
index a18f9ef..718b0d0 100644
--- a/kerby-asn1/pom.xml
+++ b/kerby-asn1/pom.xml
@@ -12,14 +12,12 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-backend/json-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/pom.xml b/kerby-backend/json-backend/pom.xml
index 3b34f17..f9bf4f3 100644
--- a/kerby-backend/json-backend/pom.xml
+++ b/kerby-backend/json-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>json-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-backend/ldap-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/ldap-backend/pom.xml b/kerby-backend/ldap-backend/pom.xml
index 315230e..2e0c5aa 100644
--- a/kerby-backend/ldap-backend/pom.xml
+++ b/kerby-backend/ldap-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>ldap-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-backend/mavibot-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot-backend/pom.xml b/kerby-backend/mavibot-backend/pom.xml
index 5cda6ea..e0fd72f 100644
--- a/kerby-backend/mavibot-backend/pom.xml
+++ b/kerby-backend/mavibot-backend/pom.xml
@@ -17,13 +17,12 @@
specific language governing permissions and limitations
under the License.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>mavibot-backend</artifactId>
<name>Mavibot based backend</name>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/pom.xml b/kerby-backend/pom.xml
index 23aed47..15f8fdb 100644
--- a/kerby-backend/pom.xml
+++ b/kerby-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerby-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-backend/zookeeper-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/pom.xml b/kerby-backend/zookeeper-backend/pom.xml
index 2f25b28..d0a701c 100644
--- a/kerby-backend/zookeeper-backend/pom.xml
+++ b/kerby-backend/zookeeper-backend/pom.xml
@@ -12,13 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>zookeeper-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-config/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-config/pom.xml b/kerby-config/pom.xml
index 3769c61..bca15e1 100644
--- a/kerby-config/pom.xml
+++ b/kerby-config/pom.xml
@@ -12,14 +12,12 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index a401183..2617960 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -12,13 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-dist</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kdc-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/pom.xml b/kerby-dist/pom.xml
index 1fa2454..f6dcb1e 100644
--- a/kerby-dist/pom.xml
+++ b/kerby-dist/pom.xml
@@ -12,15 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerby-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-dist/tool-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/pom.xml b/kerby-dist/tool-dist/pom.xml
index a8c823b..8a4144b 100644
--- a/kerby-dist/tool-dist/pom.xml
+++ b/kerby-dist/tool-dist/pom.xml
@@ -12,13 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-dist</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>tool-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kdc-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/pom.xml b/kerby-kdc-test/pom.xml
index 576761b..2acd191 100644
--- a/kerby-kdc-test/pom.xml
+++ b/kerby-kdc-test/pom.xml
@@ -12,13 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerby-kdc-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc/pom.xml b/kerby-kdc/pom.xml
index 08ca131..b0417db 100644
--- a/kerby-kdc/pom.xml
+++ b/kerby-kdc/pom.xml
@@ -12,13 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerby-kdc</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/pom.xml b/kerby-kerb/integration-test/pom.xml
index 769bfc4..0af11d9 100644
--- a/kerby-kerb/integration-test/pom.xml
+++ b/kerby-kerb/integration-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>integration-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-admin/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin/pom.xml b/kerby-kerb/kerb-admin/pom.xml
index e44c4a2..da16b90 100644
--- a/kerby-kerb/kerb-admin/pom.xml
+++ b/kerby-kerb/kerb-admin/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-admin</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-client-api-all/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client-api-all/pom.xml b/kerby-kerb/kerb-client-api-all/pom.xml
index 9e4f2c6..aa3a48e 100644
--- a/kerby-kerb/kerb-client-api-all/pom.xml
+++ b/kerby-kerb/kerb-client-api-all/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-client-api-all</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-client/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/pom.xml b/kerby-kerb/kerb-client/pom.xml
index a6cd0df..3208405 100644
--- a/kerby-kerb/kerb-client/pom.xml
+++ b/kerby-kerb/kerb-client/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-client</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-common/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/pom.xml b/kerby-kerb/kerb-common/pom.xml
index f47fba6..45d2894 100644
--- a/kerby-kerb/kerb-common/pom.xml
+++ b/kerby-kerb/kerb-common/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-common</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-core-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/pom.xml b/kerby-kerb/kerb-core-test/pom.xml
index 9224218..8940d99 100644
--- a/kerby-kerb/kerb-core-test/pom.xml
+++ b/kerby-kerb/kerb-core-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-core-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-core/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/pom.xml b/kerby-kerb/kerb-core/pom.xml
index d5e85c7..07c819f 100644
--- a/kerby-kerb/kerb-core/pom.xml
+++ b/kerby-kerb/kerb-core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-core</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/pom.xml b/kerby-kerb/kerb-crypto/pom.xml
index 4975afd..539de46 100644
--- a/kerby-kerb/kerb-crypto/pom.xml
+++ b/kerby-kerb/kerb-crypto/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-crypto</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-identity-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity-test/pom.xml b/kerby-kerb/kerb-identity-test/pom.xml
index ee0f02e..871c3aa 100644
--- a/kerby-kerb/kerb-identity-test/pom.xml
+++ b/kerby-kerb/kerb-identity-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-identity-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-identity/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity/pom.xml b/kerby-kerb/kerb-identity/pom.xml
index 890defd..6905cc3 100644
--- a/kerby-kerb/kerb-identity/pom.xml
+++ b/kerby-kerb/kerb-identity/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-identity</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-kdc-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/pom.xml b/kerby-kerb/kerb-kdc-test/pom.xml
index c592a01..8a8cbbe 100644
--- a/kerby-kerb/kerb-kdc-test/pom.xml
+++ b/kerby-kerb/kerb-kdc-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-kdc-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-server-api-all/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server-api-all/pom.xml b/kerby-kerb/kerb-server-api-all/pom.xml
index 5d77d8c..d5e3c66 100644
--- a/kerby-kerb/kerb-server-api-all/pom.xml
+++ b/kerby-kerb/kerb-server-api-all/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-server-api-all</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-server/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/pom.xml b/kerby-kerb/kerb-server/pom.xml
index 0f370f2..139d215 100644
--- a/kerby-kerb/kerb-server/pom.xml
+++ b/kerby-kerb/kerb-server/pom.xml
@@ -12,13 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-server</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-simplekdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/pom.xml b/kerby-kerb/kerb-simplekdc/pom.xml
index ee7a5d7..1e9ce65 100644
--- a/kerby-kerb/kerb-simplekdc/pom.xml
+++ b/kerby-kerb/kerb-simplekdc/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-simplekdc</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/kerb-util/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/pom.xml b/kerby-kerb/kerb-util/pom.xml
index a1d4380..4bd4f15 100644
--- a/kerby-kerb/kerb-util/pom.xml
+++ b/kerby-kerb/kerb-util/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerb-util</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-kerb/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/pom.xml b/kerby-kerb/pom.xml
index 2cc3241..32bc10a 100644
--- a/kerby-kerb/pom.xml
+++ b/kerby-kerb/pom.xml
@@ -12,13 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerby-kerb</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-provider/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-provider/pom.xml b/kerby-provider/pom.xml
index f7b1cf0..7b2bfa7 100644
--- a/kerby-provider/pom.xml
+++ b/kerby-provider/pom.xml
@@ -12,13 +12,11 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kerby-all</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-provider/token-provider/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/pom.xml b/kerby-provider/token-provider/pom.xml
index 530a45c..d51992a 100644
--- a/kerby-provider/token-provider/pom.xml
+++ b/kerby-provider/token-provider/pom.xml
@@ -12,13 +12,11 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>kerby-provider</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-tool/client-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/pom.xml b/kerby-tool/client-tool/pom.xml
index 7dd0e8a..adef01f 100644
--- a/kerby-tool/client-tool/pom.xml
+++ b/kerby-tool/client-tool/pom.xml
@@ -12,13 +12,13 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-tool</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>client-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-tool/kdc-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/kdc-tool/pom.xml b/kerby-tool/kdc-tool/pom.xml
index ab13016..7afb9ea 100644
--- a/kerby-tool/kdc-tool/pom.xml
+++ b/kerby-tool/kdc-tool/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-tool</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kdc-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/pom.xml b/kerby-tool/pom.xml
index 00d4489..3721fb9 100644
--- a/kerby-tool/pom.xml
+++ b/kerby-tool/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerby-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/kerby-util/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-util/pom.xml b/kerby-util/pom.xml
index 42683e5..4f156d1 100644
--- a/kerby-util/pom.xml
+++ b/kerby-util/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
</parent>
<artifactId>kerby-util</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c49e9d47/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 274ee8b..feee170 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1-SNAPSHOT</version>
+ <version>1.0.0-RC1</version>
<packaging>pom</packaging>
<name>Apache Kerby Project</name>
@@ -36,7 +36,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-kerby.git</connection>
<url>https://github.com/apache/directory-kerby</url>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-kerby.git</developerConnection>
- <tag>HEAD</tag>
+ <tag>kerby-all-1.0.0-RC1</tag>
</scm>
<distributionManagement>
@@ -262,7 +262,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
<pluginExecution>
@@ -279,7 +279,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
[16/46] directory-kerby git commit: fix javadoc warning for
ldap-backend module
Posted by pl...@apache.org.
fix javadoc warning for ldap-backend module
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1ac2d0a5
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1ac2d0a5
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1ac2d0a5
Branch: refs/heads/pkinit-support
Commit: 1ac2d0a5232537b5a7b44f53054004ec256b99e6
Parents: 4a60163
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 13:27:48 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 13:27:48 2015 +0800
----------------------------------------------------------------------
.../identitybackend/LdapIdentityGetHelper.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1ac2d0a5/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 db0bb0d..3ea17ae 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
@@ -42,6 +42,8 @@ public class LdapIdentityGetHelper {
/**
* Get principal name.
+ * @throws LdapInvalidAttributeValueException
+ * @return principal name
*/
public PrincipalName getPrincipalName() throws LdapInvalidAttributeValueException {
String principalNameStr = entry.get(KerberosAttribute.KRB5_PRINCIPAL_NAME_AT).getString();
@@ -51,6 +53,8 @@ public class LdapIdentityGetHelper {
/**
* Get key version.
+ * @throws LdapInvalidAttributeValueException
+ * @return key version
*/
public int getKeyVersion() throws LdapInvalidAttributeValueException {
String keyVersionStr = entry.get(KerberosAttribute.KRB5_KEY_VERSION_NUMBER_AT).getString();
@@ -60,6 +64,8 @@ public class LdapIdentityGetHelper {
/**
* Get keys.
+ * @throws IOException
+ * @return keys
*/
public List<EncryptionKey> getKeys() throws IOException {
Iterator<Value<?>> iterator1 = entry.get(KerberosAttribute.KRB5_KEY_AT).iterator();
@@ -76,6 +82,9 @@ public class LdapIdentityGetHelper {
/**
* Get created time.
+ * @throws LdapInvalidAttributeValueException
+ * @throws ParseException
+ * @return created time
*/
public KerberosTime getCreatedTime() throws LdapInvalidAttributeValueException,
ParseException {
@@ -85,6 +94,9 @@ public class LdapIdentityGetHelper {
/**
* Get expire time.
+ * @throws LdapInvalidAttributeValueException
+ * @throws ParseException
+ * @return the expire time
*/
public KerberosTime getExpireTime() throws LdapInvalidAttributeValueException,
ParseException {
@@ -94,6 +106,8 @@ public class LdapIdentityGetHelper {
/**
* Get whether disabled.
+ * @throws LdapInvalidAttributeValueException
+ * @return whether this krb5 account is disabled
*/
public boolean getDisabled() throws LdapInvalidAttributeValueException {
String disabled = entry.get(KerberosAttribute.KRB5_ACCOUNT_DISABLED_AT).getString();
@@ -102,6 +116,8 @@ public class LdapIdentityGetHelper {
/**
* Get kdc flags.
+ * @throws LdapInvalidAttributeValueException
+ * @return kdc flags
*/
public int getKdcFlags() throws LdapInvalidAttributeValueException {
String krb5KDCFlags = entry.get("krb5KDCFlags").getString();
@@ -110,6 +126,8 @@ public class LdapIdentityGetHelper {
/**
* Get whether locked.
+ * @throws LdapInvalidAttributeValueException
+ * @return whether the krb5 account is locked
*/
public boolean getLocked() throws LdapInvalidAttributeValueException {
String lockedOut = entry.get(KerberosAttribute.KRB5_ACCOUNT_LOCKEDOUT_AT).getString();
[21/46] directory-kerby git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-kerby
Posted by pl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/b1815d63
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b1815d63
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b1815d63
Branch: refs/heads/pkinit-support
Commit: b1815d633c937831a4a186c3ddac4d72c1e98682
Parents: 4122f3f 4f822df
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 14:02:12 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 14:02:12 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/common/KrbUtil.java | 4 +-
.../kerb/transport/KdcUdpTransport.java | 2 +-
.../kerb/transport/KrbTcpTransport.java | 2 +-
.../kerberos/kerb/transport/KrbTransport.java | 9 +-
.../kerb/transport/KrbUdpTransport.java | 2 +-
.../kerberos/kerb/crypto/EncryptionHandler.java | 115 ++++++++++++++++++-
.../kerberos/kerb/crypto/fast/FastUtil.java | 18 ++-
.../kerb/crypto/key/AbstractKeyMaker.java | 5 +-
.../kerberos/kerb/crypto/key/DesKeyMaker.java | 9 +-
.../kerberos/kerb/crypto/random/JavaRandom.java | 3 +-
.../kerb/crypto/random/RandomProvider.java | 4 +-
.../kerberos/kerb/crypto/util/Camellia.java | 8 ++
.../kerby/kerberos/kerb/crypto/util/Des.java | 3 +
.../kerby/kerberos/kerb/crypto/util/Nfold.java | 5 +-
.../kerberos/kerb/identity/IdentityService.java | 14 ++-
.../backend/AbstractIdentityBackend.java | 18 ++-
.../kerb/identity/backend/IdentityBackend.java | 2 +
17 files changed, 186 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[20/46] directory-kerby git commit: add JavaDoc for zookeeper-backend
Posted by pl...@apache.org.
add JavaDoc for zookeeper-backend
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4122f3f6
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4122f3f6
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4122f3f6
Branch: refs/heads/pkinit-support
Commit: 4122f3f6d07873e2b7a71a57dec1af475c015c25
Parents: 1ac2d0a
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 14:01:42 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 14:01:42 2015 +0800
----------------------------------------------------------------------
.../identitybackend/IdentityZNodeHelper.java | 33 ++++++++++++++++++++
.../kerberos/kdc/identitybackend/ZKUtil.java | 31 ++++++++++++++++--
.../ZookeeperIdentityBackend.java | 2 +-
3 files changed, 63 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4122f3f6/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
index ac59ae9..565e781 100644
--- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
+++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
@@ -42,6 +42,7 @@ public class IdentityZNodeHelper {
/**
* Get base znode.
+ * @return Base
*/
public static String getBaseZNode() {
return baseZNode;
@@ -49,6 +50,7 @@ public class IdentityZNodeHelper {
/**
* Get identities znode.
+ * @return Identities.
*/
public static String getIdentitiesZNode() {
return ZKUtil.joinZNode(getBaseZNode(), IDENTITIES_ZNODE_NAME);
@@ -56,6 +58,8 @@ public class IdentityZNodeHelper {
/**
* Get identity znode.
+ * @param principalName Principal name
+ * @return Identity
*/
public static String getIndentityZNode(String principalName) {
return ZKUtil.joinZNode(getIdentitiesZNode(), principalName);
@@ -63,6 +67,8 @@ public class IdentityZNodeHelper {
/**
* Get principal name znode.
+ * @param principalName Principal name.
+ * @return Principal name
*/
public static String getPrincipalNameZnode(String principalName) {
return ZKUtil.joinZNode(getIndentityZNode(principalName), PRINCIPAL_NAME_ZNODE_NAME);
@@ -70,6 +76,8 @@ public class IdentityZNodeHelper {
/**
* Get key version znode.
+ * @param principalName Principal name.
+ * @return Key version
*/
public static String getKeyVersionZNode(String principalName) {
return ZKUtil.joinZNode(getIndentityZNode(principalName), KEY_VERSION_ZNODE_NAME);
@@ -77,6 +85,8 @@ public class IdentityZNodeHelper {
/**
* Get kdc flags znode.
+ * @param principalName Principal name.
+ * @return Kdc flags
*/
public static String getKdcFlagsZNode(String principalName) {
return ZKUtil.joinZNode(getIndentityZNode(principalName), KDC_FLAGS_ZNODE_NAME);
@@ -84,6 +94,8 @@ public class IdentityZNodeHelper {
/**
* Get disabled znode.
+ * @param principalName Principal name.
+ * @return Whether this principal's account is disabled.
*/
public static String getDisabledZNode(String principalName) {
return ZKUtil.joinZNode(getIndentityZNode(principalName), DISABLED_ZNODE_NAME);
@@ -91,6 +103,8 @@ public class IdentityZNodeHelper {
/**
* Get locked znode.
+ * @param principalName Principal name.
+ * @return Whether principal's account is locked
*/
public static String getLockedZNode(String principalName) {
return ZKUtil.joinZNode(getIndentityZNode(principalName), LOCKED_ZNODE_NAME);
@@ -98,6 +112,8 @@ public class IdentityZNodeHelper {
/**
* Get expire time znode.
+ * @param principalName Principal name.
+ * @return Expired time.
*/
public static String getExpireTimeZNode(String principalName) {
return ZKUtil.joinZNode(getIndentityZNode(principalName), EXPIRE_TIME_ZNODE_NAME);
@@ -105,6 +121,8 @@ public class IdentityZNodeHelper {
/**
* Get created time znode.
+ * @param principalName Principal name.
+ * @return Created time.
*/
public static String getCreatedTimeZNode(String principalName) {
return ZKUtil.joinZNode(getIndentityZNode(principalName), CREATED_TIME_ZNODE_NAME);
@@ -112,6 +130,8 @@ public class IdentityZNodeHelper {
/**
* Get keys znode.
+ * @param principalName Principal name.
+ * @return Key
*/
public static String getKeysZNode(String principalName) {
return ZKUtil.joinZNode(getIndentityZNode(principalName), KEYS_ZNODE_NAME);
@@ -119,6 +139,9 @@ public class IdentityZNodeHelper {
/**
* Get key type znode.
+ * @param principalName Principal name.
+ * @param type Key type.
+ * @return Key type.
*/
public static String getKeyTypeZNode(String principalName, String type) {
return ZKUtil.joinZNode(getKeysZNode(principalName), type);
@@ -126,6 +149,9 @@ public class IdentityZNodeHelper {
/**
* Get encryption key type znode.
+ * @param principalName Principal name.
+ * @param type Encryption type.
+ * @return Encryption key type
*/
public static String getEncryptionKeyTypeZNode(String principalName, String type) {
return ZKUtil.joinZNode(getKeyTypeZNode(principalName, type), KEY_TYPE_ZNODE_NAME);
@@ -133,6 +159,9 @@ public class IdentityZNodeHelper {
/**
* Get encryption key znode.
+ * @param principalName Principal Name.
+ * @param type Encryption type.
+ * @return Encryption key
*/
public static String getEncryptionKeyZNode(String principalName, String type) {
return ZKUtil.joinZNode(getKeyTypeZNode(principalName, type), KEY_ZNODE_NAME);
@@ -140,6 +169,9 @@ public class IdentityZNodeHelper {
/**
* Get encryption key kvno znode.
+ * @param principalName Principal name.
+ * @param type Key type.
+ * @return Encryption key
*/
public static String getEncryptionKeyNoZNode(String principalName, String type) {
return ZKUtil.joinZNode(getKeyTypeZNode(principalName, type), ENCRYPTION_KEY_NO_ZNODE_NAME);
@@ -148,6 +180,7 @@ public class IdentityZNodeHelper {
/**
* Get identity names.
*
+ * @throws org.apache.zookeeper.KeeperException
* @param zk The zookeeper
* @return The list of principal names.
*/
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4122f3f6/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java
index 5a46920..128c59f 100644
--- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java
+++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java
@@ -44,6 +44,10 @@ public class ZKUtil {
/**
* Check if the specified node exists. Sets no watches.
+ * @throws org.apache.zookeeper.KeeperException
+ * @param zk Zookeeper.
+ * @param node Node.
+ * @return The version.
*/
public static int checkExists(ZooKeeper zk, String node)
throws KeeperException {
@@ -60,6 +64,11 @@ public class ZKUtil {
/**
* Sets the data of the existing znode to be the specified data.
+ * @throws org.apache.zookeeper.KeeperException
+ * @param zk Zookeeper
+ * @param node Node
+ * @param data Data
+ * @return Whether the data is set or not.
*/
public static boolean setData(ZooKeeper zk, String node, byte[] data)
throws KeeperException {
@@ -74,6 +83,9 @@ public class ZKUtil {
/**
* Set data into node creating node if it doesn't yet exist.
* Does not set watch.
+ * @param zk Zookeeper.
+ * @param node Node.
+ * @param data Data.
*/
public static void createSetData(final ZooKeeper zk, final String node,
final byte[] data)
@@ -87,6 +99,7 @@ public class ZKUtil {
/**
* Creates the specified node and all parent nodes required for it to exist.
+ * @throws org.apache.zookeeper.KeeperException
*/
public static void createWithParents(ZooKeeper zk, String node)
throws KeeperException {
@@ -97,6 +110,10 @@ public class ZKUtil {
* Creates the specified node and all parent nodes required for it to exist. The creation of
* parent znodes is not atomic with the leafe znode creation but the data is written atomically
* when the leaf node is created.
+ * @throws org.apache.zookeeper.KeeperException
+ * @param zk zookeeper.
+ * @param node node
+ * @param data data
*/
public static void createWithParents(ZooKeeper zk, String node, byte[] data)
throws KeeperException {
@@ -118,6 +135,9 @@ public class ZKUtil {
/**
* Returns the ACL list
+ * @param zk zookeeper
+ * @param node node
+ * @return The acl created.
*/
private static ArrayList<ACL> createACL(ZooKeeper zk, String node) { //NOPMD
return ZooDefs.Ids.OPEN_ACL_UNSAFE; //TODO
@@ -126,6 +146,7 @@ public class ZKUtil {
/**
* Returns the full path of the immediate parent of the specified node.
* null if passed the root node or an invalid node
+ * @return index
*/
public static String getParent(String node) {
int idx = node.lastIndexOf(ZNODE_PATH_SEPARATOR);
@@ -134,6 +155,9 @@ public class ZKUtil {
/**
* Get znode data. Does not set a watcher.
+ * @throws org.apache.zookeeper.KeeperException
+ * @throws java.lang.InterruptedException
+ * @return Data of the node
*/
public static byte[] getData(ZooKeeper zk, String node)
throws KeeperException, InterruptedException {
@@ -152,6 +176,8 @@ public class ZKUtil {
/**
* Lists the children of the specified node without setting any watches.
* null if parent does not exist
+ * @throws org.apache.zookeeper.KeeperException
+ * @return children
*/
public static List<String> listChildrenNoWatch(ZooKeeper zk, String node)
throws KeeperException {
@@ -169,11 +195,12 @@ public class ZKUtil {
/**
* Delete the specified node and all of it's children.
- * <p/>
* If the node does not exist, just returns.
- * <p/>
* Sets no watches. Throws all exceptions besides dealing with deletion of
* children.
+ * @throws KeeperException
+ * @param zk The zookeeper.
+ * @param node The node to be deleted.
*/
public static void deleteNodeRecursively(ZooKeeper zk, String node) throws KeeperException {
List<String> children = ZKUtil.listChildrenNoWatch(zk, node);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4122f3f6/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java
index a85476f..3c91498 100644
--- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java
+++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZookeeperIdentityBackend.java
@@ -62,7 +62,7 @@ public class ZookeeperIdentityBackend extends AbstractIdentityBackend {
/**
* Constructing an instance using specified config that contains anything
* to be used to init the Zookeeper backend.
- * @param config
+ * @param config The configuration for zookeeper identity backend.
*/
public ZookeeperIdentityBackend(Config config) {
setConfig(config);
[25/46] directory-kerby git commit: add JavaDoc for token-provider
module
Posted by pl...@apache.org.
add JavaDoc for token-provider module
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/947c15c9
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/947c15c9
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/947c15c9
Branch: refs/heads/pkinit-support
Commit: 947c15c97f30846f05ef2e229edfddfca25c3cfe
Parents: 19676d9
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 14:25:03 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 14:25:03 2015 +0800
----------------------------------------------------------------------
.../apache/kerby/kerberos/provider/token/JwtTokenDecoder.java | 6 ++++--
.../java/org/apache/kerby/kerberos/provider/token/JwtUtil.java | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/947c15c9/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java
index 9c7eb5f..a99af62 100644
--- a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java
+++ b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java
@@ -129,7 +129,8 @@ public class JwtTokenDecoder implements TokenDecoder {
/**
* Decrypt the Encrypted JWT
*
- * @param encryptedJWT
+ * @throws java.io.IOException
+ * @param encryptedJWT an encrypted JWT
*/
public void decryptEncryptedJWT(EncryptedJWT encryptedJWT) throws IOException {
RSADecrypter decrypter = new RSADecrypter(decryptionKey);
@@ -152,7 +153,8 @@ public class JwtTokenDecoder implements TokenDecoder {
/**
* verify the Signed JWT
*
- * @param signedJWT
+ * @throws java.io.IOException
+ * @param signedJWT a signed JWT
* @return whether verify success
*/
public boolean verifySignedJWT(SignedJWT signedJWT) throws IOException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/947c15c9/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtUtil.java
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtUtil.java b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtUtil.java
index ee48e9a..aaa52e4 100644
--- a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtUtil.java
+++ b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtUtil.java
@@ -31,7 +31,8 @@ public class JwtUtil {
/**
* Get jwt claims set from read only jwt claims set
*
- * @param readOnlyClaims
+ * @param readOnlyClaims Read only claims
+ * @return Result
*/
public static JWTClaimsSet from(ReadOnlyJWTClaimsSet readOnlyClaims) {
JWTClaimsSet result = new JWTClaimsSet(readOnlyClaims);
[08/46] directory-kerby git commit: added teh distributionManagement
tag
Posted by pl...@apache.org.
added teh distributionManagement tag
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/e355be4b
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/e355be4b
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/e355be4b
Branch: refs/heads/pkinit-support
Commit: e355be4bc7467976b0d06edf6834033efd945909
Parents: 11444a0
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 12:39:56 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 12:39:56 2015 +0200
----------------------------------------------------------------------
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e355be4b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e056a7..6a40c72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,13 @@
<tag>HEAD</tag>
</scm>
+ <distributionManagement>
+ <site>
+ <id>apache.directory.kerby</id>
+ <url>scpexe://people.apache.org/www/directory.apache.org/kerby/gen-docs/${project.version}/</url>
+ </site>
+ </distributionManagement>
+
<properties>
<apacheds.version>2.0.0-M20</apacheds.version>
<ldap.api.version>1.0.0-M31</ldap.api.version>
[18/46] directory-kerby git commit: Merge remote-tracking branch
'asf/master'
Posted by pl...@apache.org.
Merge remote-tracking branch 'asf/master'
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/024d572a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/024d572a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/024d572a
Branch: refs/heads/pkinit-support
Commit: 024d572a9439152e9942b14c3bbd389415dbecbb
Parents: ec0f46b 1ac2d0a
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 13:36:43 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 13:36:43 2015 +0800
----------------------------------------------------------------------
.../identitybackend/LdapIdentityGetHelper.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
[15/46] directory-kerby git commit: Fix javadoc of kerby-asn1,
kerby-util and kerby-config.
Posted by pl...@apache.org.
Fix javadoc of kerby-asn1, kerby-util and kerby-config.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4a60163e
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4a60163e
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4a60163e
Branch: refs/heads/pkinit-support
Commit: 4a60163e3c0d277c6110d437802f06272d12ad05
Parents: a2bdc21
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 11:05:58 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 11:05:58 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kerby/asn1/Asn1Factory.java | 4 +-
.../org/apache/kerby/asn1/Asn1InputBuffer.java | 11 +++---
.../org/apache/kerby/asn1/EncodingOption.java | 2 +-
.../java/org/apache/kerby/asn1/TagClass.java | 4 +-
.../org/apache/kerby/asn1/TaggingOption.java | 16 ++++----
.../kerby/asn1/type/AbstractAsn1Type.java | 21 +++++-----
.../org/apache/kerby/asn1/type/Asn1Boolean.java | 2 +-
.../kerby/asn1/type/Asn1GeneralizedTime.java | 1 +
.../org/apache/kerby/asn1/type/Asn1Simple.java | 15 ++++----
.../org/apache/kerby/asn1/type/Asn1Type.java | 32 ++++++++--------
.../java/org/apache/kerby/config/Config.java | 40 ++++++++++----------
.../main/java/org/apache/kerby/KOptions.java | 4 +-
.../main/java/org/apache/kerby/util/Base64.java | 10 ++---
.../apache/kerby/util/Base64InputStream.java | 4 +-
.../apache/kerby/util/Base64OutputStream.java | 4 +-
.../java/org/apache/kerby/util/HexUtil.java | 4 ++
.../main/java/org/apache/kerby/util/IOUtil.java | 12 +++---
17 files changed, 96 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Factory.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Factory.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Factory.java
index ea4eca8..7610751 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Factory.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1Factory.java
@@ -30,7 +30,7 @@ public class Asn1Factory {
/**
* Create an ASN1 type with specified tag number
- * @param tagNo
+ * @param tagNo The tag number
* @return ASN1 type
*/
public static Asn1Type create(int tagNo) {
@@ -43,7 +43,7 @@ public class Asn1Factory {
/**
* Create an ASN1 type with specified tag
- * @param tagNo
+ * @param tagNo The tag number
* @return ASN1 type
*/
public static Asn1Type create(UniversalTag tagNo) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java
index 1cda697..2441749 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java
@@ -36,7 +36,7 @@ public class Asn1InputBuffer {
/**
* Constructor with bytes.
- * @param bytes
+ * @param bytes The bytes
*/
public Asn1InputBuffer(byte[] bytes) {
this(new LimitedByteBuffer(bytes));
@@ -44,7 +44,7 @@ public class Asn1InputBuffer {
/**
* Constructor with a ByteBuffer.
- * @param byteBuffer
+ * @param byteBuffer The byte buffer
*/
public Asn1InputBuffer(ByteBuffer byteBuffer) {
this(new LimitedByteBuffer(byteBuffer));
@@ -52,7 +52,7 @@ public class Asn1InputBuffer {
/**
* Constructor with LimitedByteBuffer.
- * @param limitedByteBuffer
+ * @param limitedByteBuffer The limited byte buffer
*/
public Asn1InputBuffer(LimitedByteBuffer limitedByteBuffer) {
this.limitedBuffer = limitedByteBuffer;
@@ -81,9 +81,10 @@ public class Asn1InputBuffer {
}
/**
+ * Read from bytes.
*
- * @param bytes
- * @throws IOException
+ * @param bytes The bytes
+ * @throws IOException e
*/
public void readBytes(byte[] bytes) throws IOException {
limitedBuffer.readBytes(bytes);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
index 8205d45..d9627e0 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/EncodingOption.java
@@ -113,7 +113,7 @@ public class EncodingOption {
/**
* Tells if it's definitive length or not.
- * @return
+ * @return The boolean value
*/
public boolean isDefLen() {
return this.isDefLen;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/TagClass.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/TagClass.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/TagClass.java
index bac9db8..cbd02fc 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/TagClass.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/TagClass.java
@@ -69,7 +69,7 @@ public enum TagClass {
/**
* Converted from an integer
- * @param value
+ * @param value The int value of tag class
* @return tag class
*/
public static TagClass fromValue(int value) {
@@ -90,7 +90,7 @@ public enum TagClass {
/**
* Converted from a tag value, which contains tag class info.
- * @param tag
+ * @param tag The int value of tag class
* @return tag class
*/
public static TagClass fromTagFlags(int tag) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java
index 98b4c23..f72d3e9 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/TaggingOption.java
@@ -29,7 +29,7 @@ public final class TaggingOption {
/**
* Create an implicit application specific tagging option with tagNo.
- * @param tagNo
+ * @param tagNo The tag number
* @return tagging option
*/
public static TaggingOption newImplicitAppSpecific(int tagNo) {
@@ -38,7 +38,7 @@ public final class TaggingOption {
/**
* Create an explicit application specific tagging option with tagNo.
- * @param tagNo
+ * @param tagNo The tag number
* @return tagging option
*/
public static TaggingOption newExplicitAppSpecific(int tagNo) {
@@ -47,7 +47,7 @@ public final class TaggingOption {
/**
* Create an implicit context specific tagging option with tagNo.
- * @param tagNo
+ * @param tagNo The tag number
* @return tagging option
*/
public static TaggingOption newImplicitContextSpecific(int tagNo) {
@@ -56,7 +56,7 @@ public final class TaggingOption {
/**
* Create an explicit context specific tagging option with tagNo.
- * @param tagNo
+ * @param tagNo The tag number
* @return tagging option
*/
public static TaggingOption newExplicitContextSpecific(int tagNo) {
@@ -65,9 +65,9 @@ public final class TaggingOption {
/**
* The private constructor.
- * @param tagNo
- * @param isImplicit
- * @param isAppSpecific
+ * @param tagNo The tag number
+ * @param isImplicit Implicit or not
+ * @param isAppSpecific App specific or not
*/
private TaggingOption(int tagNo, boolean isImplicit, boolean isAppSpecific) {
this.tagNo = tagNo;
@@ -77,7 +77,7 @@ public final class TaggingOption {
/**
* Make tag flags giving it's tagged constructed.
- * @param isTaggedConstructed
+ * @param isTaggedConstructed Tagged Constructed or not
* @return tag flag
*/
public int tagFlags(boolean isTaggedConstructed) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
index 4f41998..f0fbf35 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
@@ -44,8 +44,8 @@ public abstract class AbstractAsn1Type<T> implements Asn1Type {
/**
* Default constructor, generally for decoding as a value container
- * @param tagClass
- * @param tagNo
+ * @param tagClass The tag class
+ * @param tagNo The tag number
*/
public AbstractAsn1Type(TagClass tagClass, int tagNo) {
this(tagClass, tagNo, null);
@@ -53,8 +53,8 @@ public abstract class AbstractAsn1Type<T> implements Asn1Type {
/**
* Default constructor, generally for decoding as a value container
- * @param tagFlags
- * @param tagNo
+ * @param tagFlags The tag flags
+ * @param tagNo The tag number
*/
public AbstractAsn1Type(int tagFlags, int tagNo) {
this(tagFlags, tagNo, null);
@@ -62,9 +62,9 @@ public abstract class AbstractAsn1Type<T> implements Asn1Type {
/**
* Constructor with a value, generally for encoding of the value
- * @param tagFlags
- * @param tagNo
- * @param value
+ * @param tagFlags The tag flags
+ * @param tagNo The tag number
+ * @param value The value
*/
public AbstractAsn1Type(int tagFlags, int tagNo, T value) {
this(TagClass.fromTagFlags(tagFlags), tagNo, value);
@@ -73,8 +73,9 @@ public abstract class AbstractAsn1Type<T> implements Asn1Type {
/**
* Constructor with a value, generally for encoding of the value
- * @param tagNo
- * @param value
+ * @param tagClass The tag class
+ * @param tagNo The tag number
+ * @param value The value
*/
public AbstractAsn1Type(TagClass tagClass, int tagNo, T value) {
this.tagClass = tagClass;
@@ -84,7 +85,7 @@ public abstract class AbstractAsn1Type<T> implements Asn1Type {
/**
* Set encoding option
- * @param encodingOption
+ * @param encodingOption The encoding option
*/
public void setEncodingOption(EncodingOption encodingOption) {
this.encodingOption = encodingOption;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Boolean.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Boolean.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Boolean.java
index 3fc70c2..3b70e52 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Boolean.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Boolean.java
@@ -43,7 +43,7 @@ public class Asn1Boolean extends Asn1Simple<Boolean> {
/**
* Constructor with a value, generally for encoding of the value
- * @param value
+ * @param value The boolean value
*/
public Asn1Boolean(Boolean value) {
super(UniversalTag.BOOLEAN, value);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java
index 712356e..0c2e1f9 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1GeneralizedTime.java
@@ -36,6 +36,7 @@ public class Asn1GeneralizedTime extends Asn1Simple<Date> {
/**
* time in milliseconds
+ * @param time The long time
*/
public Asn1GeneralizedTime(long time) {
super(UniversalTag.GENERALIZED_TIME, new Date(time));
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java
index 8a7a2af..877c2f3 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Simple.java
@@ -28,14 +28,13 @@ import java.nio.ByteBuffer;
/**
* ASN1 simple type, of single value other than complex type of multiple values.
- * @param <T>
*/
public abstract class Asn1Simple<T> extends AbstractAsn1Type<T> {
private byte[] bytes;
/**
* Default constructor, generally for decoding as a value container
- * @param tagNo
+ * @param tagNo The tag number
*/
public Asn1Simple(UniversalTag tagNo) {
this(tagNo, null);
@@ -43,8 +42,8 @@ public abstract class Asn1Simple<T> extends AbstractAsn1Type<T> {
/**
* Constructor with a value, generally for encoding of the value
- * @param tagNo
- * @param value
+ * @param tagNo The tag number
+ * @param value The value
*/
public Asn1Simple(UniversalTag tagNo, T value) {
super(TagClass.UNIVERSAL, tagNo.getValue(), value);
@@ -142,8 +141,8 @@ public abstract class Asn1Simple<T> extends AbstractAsn1Type<T> {
/**
* Create a simple ASN1 object given tagNo, using the default constructor with no value provided
- * @param tagNo
- * @return
+ * @param tagNo The tag number
+ * @return A simple ASN1 object
*/
public static Asn1Type createSimple(int tagNo) {
if (!isSimple(tagNo)) {
@@ -154,8 +153,8 @@ public abstract class Asn1Simple<T> extends AbstractAsn1Type<T> {
/**
* Create a simple ASN1 object given tagNo, using the default constructor with no value provided
- * @param tagNo
- * @return
+ * @param tagNo The tag number
+ * @return The simple ASN1 object
*/
public static Asn1Type createSimple(UniversalTag tagNo) {
if (!isSimple(tagNo)) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Type.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Type.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Type.java
index 3ddd16f..c77418b 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Type.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Type.java
@@ -31,7 +31,7 @@ import java.nio.ByteBuffer;
public interface Asn1Type {
/**
*
- * @return
+ * @return The tag flags
*/
int tagFlags();
@@ -44,7 +44,7 @@ public interface Asn1Type {
/**
* Set encoding option.
* See {@link org.apache.kerby.asn1.EncodingOption}.
- * @param encodingOption
+ * @param encodingOption The encoding option
*/
void setEncodingOption(EncodingOption encodingOption);
@@ -63,35 +63,35 @@ public interface Asn1Type {
/**
* Encode the type, by recursively, using the provided buffer.
- * @param buffer
+ * @param buffer The byte buffer
*/
void encode(ByteBuffer buffer);
/**
* Decode the content bytes into this type.
- * @param content
- * @throws IOException
+ * @param content The content bytes
+ * @throws IOException e
*/
void decode(byte[] content) throws IOException;
/**
* Decode the content bytes into this type.
- * @param content
- * @throws IOException
+ * @param content The content bytes
+ * @throws IOException e
*/
void decode(ByteBuffer content) throws IOException;
/**
* Tag and encode this type using the provided tagging option.
- * @param taggingOption
+ * @param taggingOption The tagging option
* @return encoded bytes
*/
byte[] taggedEncode(TaggingOption taggingOption);
/**
* Tag and encode this type using the provided tagging option.
- * @param taggingOption
- * @return encoded bytes
+ * @param buffer The byte buffer
+ * @param taggingOption The tagging option
*/
void taggedEncode(ByteBuffer buffer, TaggingOption taggingOption);
@@ -101,9 +101,9 @@ public interface Asn1Type {
*
* See {@link org.apache.kerby.asn1.TaggingOption}
*
- * @param content
- * @param taggingOption
- * @throws IOException
+ * @param content The content bytes
+ * @param taggingOption The tagging option
+ * @throws IOException e
*/
void taggedDecode(ByteBuffer content, TaggingOption taggingOption) throws IOException;
@@ -113,9 +113,9 @@ public interface Asn1Type {
*
* See {@link org.apache.kerby.asn1.TaggingOption}
*
- * @param content
- * @param taggingOption
- * @throws IOException
+ * @param content The content bytes
+ * @param taggingOption The tagging option
+ * @throws IOException e
*/
void taggedDecode(byte[] content, TaggingOption taggingOption) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-config/src/main/java/org/apache/kerby/config/Config.java
----------------------------------------------------------------------
diff --git a/kerby-config/src/main/java/org/apache/kerby/config/Config.java b/kerby-config/src/main/java/org/apache/kerby/config/Config.java
index 2eade15..81fe9f3 100644
--- a/kerby-config/src/main/java/org/apache/kerby/config/Config.java
+++ b/kerby-config/src/main/java/org/apache/kerby/config/Config.java
@@ -37,15 +37,15 @@ public interface Config {
/**
* Set a string value for the specified property
- * @param name
- * @param value
+ * @param name The property name
+ * @param value The string value
*/
void setString(String name, String value);
/**
* Set a string value for the specified property
- * @param name
- * @param value
+ * @param name The config key name
+ * @param value The string value
*/
void setString(ConfigKey name, String value);
@@ -57,15 +57,15 @@ public interface Config {
/**
* Set a boolean value for the specified property
- * @param name
- * @param value
+ * @param name The property name
+ * @param value The boolean value
*/
void setBoolean(String name, boolean value);
/**
* Set a boolean value for the specified property
- * @param name
- * @param value
+ * @param name The config key name
+ * @param value The boolean value
*/
void setBoolean(ConfigKey name, boolean value);
@@ -75,15 +75,15 @@ public interface Config {
/**
* Set an int value for the specified property
- * @param name
- * @param value
+ * @param name The property name
+ * @param value The string value
*/
void setInt(String name, int value);
/**
* Set an int value for the specified property
- * @param name
- * @param value
+ * @param name The config key name
+ * @param value The int value
*/
void setInt(ConfigKey name, int value);
@@ -94,15 +94,15 @@ public interface Config {
/**
* Set a long value for the specified property
- * @param name
- * @param value
+ * @param name The property name
+ * @param value The long value
*/
void setLong(String name, long value);
/**
* Set a long value for the specified property
- * @param name
- * @param value
+ * @param name The config key name
+ * @param value The long value
*/
void setLong(ConfigKey name, long value);
@@ -112,15 +112,15 @@ public interface Config {
/**
* Set a float value for the specified property
- * @param name
- * @param value
+ * @param name The property name
+ * @param value The float value
*/
void setFloat(String name, float value);
/**
* Set a float value for the specified property
- * @param name
- * @param value
+ * @param name The config key name
+ * @param value The float value
*/
void setFloat(ConfigKey name, float value);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-util/src/main/java/org/apache/kerby/KOptions.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/KOptions.java b/kerby-util/src/main/java/org/apache/kerby/KOptions.java
index 0094610..4ea1103 100644
--- a/kerby-util/src/main/java/org/apache/kerby/KOptions.java
+++ b/kerby-util/src/main/java/org/apache/kerby/KOptions.java
@@ -39,8 +39,8 @@ public class KOptions {
/**
* Parse string value according to kopt type.
- * @param kopt
- * @param strValue
+ * @param kopt The koption
+ * @param strValue The string value
* @return true when successful, false otherwise
*/
public static boolean parseSetValue(KOption kopt, String strValue) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/util/Base64.java b/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
index 143c8cc..fa112ba 100644
--- a/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
+++ b/kerby-util/src/main/java/org/apache/kerby/util/Base64.java
@@ -28,13 +28,13 @@ import java.math.BigInteger;
* </p>
* <p>
* The class can be parameterized in the following manner with various constructors:
+ * </p>
* <ul>
* <li>URL-safe mode: Default off.</li>
* <li>Line length: Default 76. Line length that aren't multiples of 4 will still essentially end up being multiples of
- * 4 in the encoded data.
+ * 4 in the encoded data.</li>
* <li>Line separator: Default is CRLF ("\r\n")</li>
* </ul>
- * </p>
* <p>
* Since this class operates directly on byte streams, and not character streams, it is hard-coded to only encode/decode
* character encodings which are compatible with the lower 127 ASCII chart (ISO-8859-1, Windows-1252, UTF-8, etc).
@@ -254,7 +254,7 @@ public class Base64 {
*
* @param lineLength
* Each line of encoded data will be at most of the given length (rounded down to nearest multiple of 4).
- * If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when decoding.
+ * If {@code lineLength <= 0}, then the output will not be divided into lines (chunks). Ignored when decoding.
* @since 1.4
*/
public Base64(int lineLength) {
@@ -276,7 +276,7 @@ public class Base64 {
*
* @param lineLength
* Each line of encoded data will be at most of the given length (rounded down to nearest multiple of 4).
- * If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when decoding.
+ * If {@code lineLength <= 0}, then the output will not be divided into lines (chunks). Ignored when decoding.
* @param lineSeparator
* Each line of encoded data will end with this sequence of bytes.
* @throws IllegalArgumentException
@@ -302,7 +302,7 @@ public class Base64 {
*
* @param lineLength
* Each line of encoded data will be at most of the given length (rounded down to nearest multiple of 4).
- * If lineLength <= 0, then the output will not be divided into lines (chunks). Ignored when decoding.
+ * If {@code lineLength <= 0}, then the output will not be divided into lines (chunks). Ignored when decoding.
* @param lineSeparator
* Each line of encoded data will end with this sequence of bytes.
* @param urlSafe
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-util/src/main/java/org/apache/kerby/util/Base64InputStream.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/util/Base64InputStream.java b/kerby-util/src/main/java/org/apache/kerby/util/Base64InputStream.java
index 52bab54..2d23b2d 100644
--- a/kerby-util/src/main/java/org/apache/kerby/util/Base64InputStream.java
+++ b/kerby-util/src/main/java/org/apache/kerby/util/Base64InputStream.java
@@ -86,11 +86,11 @@ public class Base64InputStream extends FilterInputStream {
* true if we should encode all data read from us, false if we should decode.
* @param lineLength
* If doEncode is true, each line of encoded data will contain lineLength characters (rounded down to
- * nearest multiple of 4). If lineLength <=0, the encoded data is not divided into lines. If doEncode is
+ * nearest multiple of 4). If {@code lineLength <=0}, the encoded data is not divided into lines. If doEncode is
* false, lineLength is ignored.
* @param lineSeparator
* If doEncode is true, each line of encoded data will be terminated with this byte sequence (e.g. \r\n).
- * If lineLength <= 0, the lineSeparator is not used. If doEncode is false lineSeparator is ignored.
+ * If {@code lineLength <= 0}, the lineSeparator is not used. If doEncode is false lineSeparator is ignored.
*/
public Base64InputStream(InputStream in, boolean doEncode, int lineLength, byte[] lineSeparator) {
super(in);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-util/src/main/java/org/apache/kerby/util/Base64OutputStream.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/util/Base64OutputStream.java b/kerby-util/src/main/java/org/apache/kerby/util/Base64OutputStream.java
index b2e09ba..6bb9f5d 100644
--- a/kerby-util/src/main/java/org/apache/kerby/util/Base64OutputStream.java
+++ b/kerby-util/src/main/java/org/apache/kerby/util/Base64OutputStream.java
@@ -85,11 +85,11 @@ public class Base64OutputStream extends FilterOutputStream {
* true if we should encode all data written to us, false if we should decode.
* @param lineLength
* If doEncode is true, each line of encoded data will contain lineLength characters (rounded down to
- * nearest multiple of 4). If lineLength <=0, the encoded data is not divided into lines. If doEncode is
+ * nearest multiple of 4). If {@code lineLength <=0}, the encoded data is not divided into lines. If doEncode is
* false, lineLength is ignored.
* @param lineSeparator
* If doEncode is true, each line of encoded data will be terminated with this byte sequence (e.g. \r\n).
- * If lineLength <= 0, the lineSeparator is not used. If doEncode is false lineSeparator is ignored.
+ * If {@code lineLength <= 0}, the lineSeparator is not used. If doEncode is false lineSeparator is ignored.
*/
public Base64OutputStream(OutputStream out, boolean doEncode, int lineLength, byte[] lineSeparator) {
super(out);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java b/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java
index 39442ee..93f6dfd 100644
--- a/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java
+++ b/kerby-util/src/main/java/org/apache/kerby/util/HexUtil.java
@@ -28,6 +28,8 @@ public final class HexUtil {
/**
* Convert bytes into format as:
* 02020080
+ * @param bytes The bytes
+ * @return The hex string
*/
public static String bytesToHex(byte[] bytes) {
int len = bytes.length * 2;
@@ -44,6 +46,8 @@ public final class HexUtil {
/**
* Convert hex string like follows into byte array
* 02020080
+ * @param hexString The hex string
+ * @return The bytes
*/
public static byte[] hex2bytes(String hexString) {
hexString = hexString.toUpperCase();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4a60163e/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java b/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
index f3760b5..bb07a8e 100644
--- a/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
+++ b/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
@@ -60,8 +60,8 @@ public final class IOUtil {
/**
* Read an input stream and return the content as string assuming UTF8.
- * @param in
- * @return
+ * @param in The input stream
+ * @return The content
* @throws IOException
*/
public static String readInput(InputStream in) throws IOException {
@@ -71,8 +71,8 @@ public final class IOUtil {
/**
* Read a file and return the content as string assuming UTF8.
- * @param file
- * @return
+ * @param file The file to read
+ * @return The content
* @throws IOException
*/
public static String readFile(File file) throws IOException {
@@ -92,8 +92,8 @@ public final class IOUtil {
/**
* Write a file with the content assuming UTF8.
- * @param content
- * @param file
+ * @param content The content
+ * @param file The file to write
* @throws IOException
*/
public static void writeFile(String content, File file) throws IOException {
[42/46] directory-kerby git commit: Added the plugin version to fix a
possible warning
Posted by pl...@apache.org.
Added the plugin version to fix a possible warning
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/0c90428b
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/0c90428b
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/0c90428b
Branch: refs/heads/pkinit-support
Commit: 0c90428b0aa140db7091e735d9517bbb5cf199e6
Parents: c3afd72
Author: drankye <ka...@intel.com>
Authored: Sun Sep 6 20:43:21 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Sun Sep 6 20:43:21 2015 +0800
----------------------------------------------------------------------
benchmark/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/0c90428b/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index ace11bf..1c43ba4 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -221,6 +221,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <version>1.4.0</version>
<executions>
<execution>
<id>run-benchmarks</id>
[12/46] directory-kerby git commit: Added a missing @param description
Posted by pl...@apache.org.
Added a missing @param description
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/01aa3810
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/01aa3810
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/01aa3810
Branch: refs/heads/pkinit-support
Commit: 01aa3810cb0c2af121339922817aebb213f0ff8d
Parents: 59ffd0e
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 16:09:17 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 16:09:17 2015 +0200
----------------------------------------------------------------------
kerby-util/src/main/java/org/apache/kerby/KOption.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/01aa3810/kerby-util/src/main/java/org/apache/kerby/KOption.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/KOption.java b/kerby-util/src/main/java/org/apache/kerby/KOption.java
index 1673395..21e1205 100644
--- a/kerby-util/src/main/java/org/apache/kerby/KOption.java
+++ b/kerby-util/src/main/java/org/apache/kerby/KOption.java
@@ -24,7 +24,7 @@ public interface KOption {
/**
* Set koption type.
*
- * @param type
+ * @param type The type
*/
void setType(KOptionType type);
@@ -87,4 +87,5 @@ public interface KOption {
* @return The value
*/
Object getValue();
-}
+}q
+
[28/46] directory-kerby git commit: Fix javadoc issues in kerb-client
module.
Posted by pl...@apache.org.
Fix javadoc issues in kerb-client module.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/205295a8
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/205295a8
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/205295a8
Branch: refs/heads/pkinit-support
Commit: 205295a8eaa0ea81a4ee6b5b6826b139883e1d5d
Parents: 947c15c
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 14:38:58 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 14:38:58 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/client/ClientUtil.java | 9 ++-
.../kerby/kerberos/kerb/client/KrbClient.java | 67 +++++++++++---------
.../kerby/kerberos/kerb/client/KrbHandler.java | 3 +
.../kerby/kerberos/kerb/client/KrbSetting.java | 4 +-
.../kerb/client/preauth/KrbPreauth.java | 32 +++++++++-
.../kerb/client/request/KdcRequest.java | 8 +++
6 files changed, 86 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/205295a8/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
index 6c75678..3dd4ae0 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/ClientUtil.java
@@ -35,6 +35,9 @@ public final class ClientUtil {
/**
* Load krb5.conf from specified conf dir.
+ * @param confDir The conf dir
+ * @return KrbConfig
+ * @throws KrbException e
*/
public static KrbConfig getConfig(File confDir) throws KrbException {
File confFile = new File(confDir, KRB5_FILE_NAME);
@@ -58,6 +61,8 @@ public final class ClientUtil {
/**
* Load default krb5.conf
+ * @return The KrbConfig
+ * @throws KrbException e
*/
public static KrbConfig getDefaultConfig() throws KrbException {
File confFile = null;
@@ -98,9 +103,9 @@ public final class ClientUtil {
/**
* Get KDC network transport addresses according to krb client setting.
- * @param setting
+ * @param setting The krb setting
* @return UDP and TCP addresses pair
- * @throws KrbException
+ * @throws KrbException e
*/
public static TransportPair getTransportPair(
KrbSetting setting) throws KrbException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/205295a8/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 4d67217..2067a6e 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
@@ -57,7 +57,7 @@ public class KrbClient {
/**
* Construct with prepared KrbConfig.
- * @param krbConfig
+ * @param krbConfig The krb config
*/
public KrbClient(KrbConfig krbConfig) {
this.krbConfig = krbConfig;
@@ -67,7 +67,8 @@ public class KrbClient {
/**
* Constructor with conf dir
- * @param confDir
+ * @param confDir The conf dir
+ * @throws KrbException e
*/
public KrbClient(File confDir) throws KrbException {
this.commonOptions = new KOptions();
@@ -77,7 +78,7 @@ public class KrbClient {
/**
* Set KDC realm for ticket request
- * @param realm
+ * @param realm The realm
*/
public void setKdcRealm(String realm) {
commonOptions.add(KrbOption.KDC_REALM, realm);
@@ -85,7 +86,7 @@ public class KrbClient {
/**
* Set KDC host.
- * @param kdcHost
+ * @param kdcHost The kdc host
*/
public void setKdcHost(String kdcHost) {
commonOptions.add(KrbOption.KDC_HOST, kdcHost);
@@ -93,7 +94,7 @@ public class KrbClient {
/**
* Set KDC tcp port.
- * @param kdcTcpPort
+ * @param kdcTcpPort The kdc tcp port
*/
public void setKdcTcpPort(int kdcTcpPort) {
if (kdcTcpPort < 1) {
@@ -105,7 +106,7 @@ public class KrbClient {
/**
* Set to allow UDP or not.
- * @param allowUdp
+ * @param allowUdp true if allow udp
*/
public void setAllowUdp(boolean allowUdp) {
commonOptions.add(KrbOption.ALLOW_UDP, allowUdp);
@@ -113,7 +114,7 @@ public class KrbClient {
/**
* Set to allow TCP or not.
- * @param allowTcp
+ * @param allowTcp true if allow tcp
*/
public void setAllowTcp(boolean allowTcp) {
commonOptions.add(KrbOption.ALLOW_TCP, allowTcp);
@@ -121,7 +122,7 @@ public class KrbClient {
/**
* Set KDC udp port. Only makes sense when allowUdp is set.
- * @param kdcUdpPort
+ * @param kdcUdpPort The kdc udp port
*/
public void setKdcUdpPort(int kdcUdpPort) {
if (kdcUdpPort < 1) {
@@ -141,7 +142,7 @@ public class KrbClient {
/**
* Init the client.
- * @throws KrbException
+ * @throws KrbException e
*/
public void init() throws KrbException {
innerClient = new DefaultInternalKrbClient(krbSetting);
@@ -162,10 +163,10 @@ public class KrbClient {
/**
* Request a TGT with user plain credential
- * @param principal
- * @param password
+ * @param principal The principal
+ * @param password The password
* @return
- * @throws KrbException
+ * @throws KrbException e
*/
public TgtTicket requestTgtWithPassword(String principal,
String password) throws KrbException {
@@ -178,10 +179,10 @@ public class KrbClient {
/**
* Request a TGT with user plain credential
- * @param principal
- * @param keytabFile
+ * @param principal The principal
+ * @param keytabFile The keytab file
* @return TGT
- * @throws KrbException
+ * @throws KrbException e
*/
public TgtTicket requestTgtWithKeytab(String principal,
File keytabFile) throws KrbException {
@@ -194,10 +195,10 @@ public class KrbClient {
/**
* Request a TGT with user x509 certificate credential
- * @param certificate
- * @param privateKey
+ * @param certificate The certificate
+ * @param privateKey The private key
* @return TGT
- * @throws KrbException
+ * @throws KrbException e
*/
public TgtTicket requestTgtWithCert(Certificate certificate,
PrivateKey privateKey) throws KrbException {
@@ -210,7 +211,7 @@ public class KrbClient {
/**
* Request a TGT with using Anonymous PKINIT
* @return TGT
- * @throws KrbException
+ * @throws KrbException e
*/
public TgtTicket requestTgtWithPkintAnonymous() throws KrbException {
KOptions requestOptions = new KOptions();
@@ -220,9 +221,10 @@ public class KrbClient {
/**
* Request a TGT with user token credential
- * @param token
+ * @param token The auth token
+ * @param armorCache The armor cache
* @return TGT
- * @throws KrbException
+ * @throws KrbException e
*/
public TgtTicket requestTgtWithToken(AuthToken token, String armorCache) throws KrbException {
if (!token.isIdToken()) {
@@ -237,9 +239,9 @@ public class KrbClient {
/**
* Request a TGT with using well prepared requestOptions.
- * @param requestOptions
+ * @param requestOptions The request options
* @return TGT
- * @throws KrbException
+ * @throws KrbException e
*/
public TgtTicket requestTgtWithOptions(KOptions requestOptions) throws KrbException {
if (requestOptions == null) {
@@ -251,10 +253,10 @@ public class KrbClient {
/**
* Request a service ticket with a TGT targeting for a server
- * @param tgt
- * @param serverPrincipal
- * @return
- * @throws KrbException
+ * @param tgt The tgt ticket
+ * @param serverPrincipal The server principal
+ * @return Service ticket
+ * @throws KrbException e
*/
public ServiceTicket requestServiceTicketWithTgt(
TgtTicket tgt, String serverPrincipal) throws KrbException {
@@ -266,8 +268,11 @@ public class KrbClient {
/**
* Request a service ticket using an Access Token.
+ * @param token The auth token
+ * @param serverPrincipal The server principal
+ * @param armorCache The armor cache
* @return service ticket
- * @throws KrbException
+ * @throws KrbException e
*/
public ServiceTicket requestServiceTicketWithAccessToken(
AuthToken token, String serverPrincipal,
@@ -284,9 +289,9 @@ public class KrbClient {
/**
* Store tgt into the specified credential cache file.
- * @param tgtTicket
- * @param ccacheFile
- * @throws KrbException
+ * @param tgtTicket The tgt ticket
+ * @param ccacheFile The credential cache file
+ * @throws KrbException e
*/
public void storeTicket(TgtTicket tgtTicket,
File ccacheFile) throws KrbException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/205295a8/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 4191265..89eb1f5 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
@@ -63,6 +63,7 @@ public abstract class KrbHandler {
* Handle the kdc request.
*
* @param kdcRequest The kdc request
+ * @throws KrbException e
*/
public void handleRequest(KdcRequest kdcRequest) throws KrbException {
kdcRequest.process();
@@ -93,6 +94,7 @@ public abstract class KrbHandler {
*
* @param kdcRequest The kdc request
* @param responseMessage The message from kdc
+ * @throws KrbException e
*/
public void onResponseMessage(
KdcRequest kdcRequest, ByteBuffer responseMessage) throws KrbException {
@@ -141,6 +143,7 @@ public abstract class KrbHandler {
*
* @param kdcRequest The kdc request
* @param requestMessage The request message to kdc
+ * @throws IOException e
*/
protected abstract void sendMessage(KdcRequest kdcRequest,
ByteBuffer requestMessage) throws IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/205295a8/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
index 7a16be7..167f977 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbSetting.java
@@ -62,7 +62,7 @@ public class KrbSetting {
/**
* Check kdc tcp setting and see if any bad.
* @return valid tcp port or -1 if not allowTcp
- * @throws KrbException
+ * @throws KrbException e
*/
public int checkGetKdcTcpPort() throws KrbException {
if (allowTcp()) {
@@ -78,7 +78,7 @@ public class KrbSetting {
/**
* Check kdc udp setting and see if any bad.
* @return valid udp port or -1 if not allowUdp
- * @throws KrbException
+ * @throws KrbException e
*/
public int checkGetKdcUdpPort() throws KrbException {
if (allowUdp()) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/205295a8/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 5e00043..1fd36c8 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
@@ -40,28 +40,40 @@ public interface KrbPreauth extends PreauthPluginMeta {
/**
* Initializing preauth plugin context
+ * @param krbContext The krb context
*/
void init(KrbContext krbContext);
/**
* Initializing request context
+ * @param kdcRequest The kdc request
+ * @return PluginRequestContext
*/
PluginRequestContext initRequestContext(KdcRequest kdcRequest);
/**
* Prepare questions to prompt to you asking for credential
+ * @param kdcRequest The kdc request
+ * @param requestContext The request context
+ * @throws KrbException e
*/
void prepareQuestions(KdcRequest kdcRequest,
PluginRequestContext requestContext) throws KrbException;
/**
* Get supported encryption types
+ * @param kdcRequest The kdc request
+ * @param requestContext The request context
+ * @return The encryption type list
*/
List<EncryptionType> getEncTypes(KdcRequest kdcRequest,
PluginRequestContext requestContext);
/**
* Set krb options passed from user
+ * @param kdcRequest The kdc request
+ * @param requestContext The request context
+ * @param preauthOptions The preauth options
*/
void setPreauthOptions(KdcRequest kdcRequest,
PluginRequestContext requestContext,
@@ -69,6 +81,10 @@ public interface KrbPreauth extends PreauthPluginMeta {
/**
* Attempt to try any initial padata derived from user options
+ * @param kdcRequest The kdc request
+ * @param requestContext The request context
+ * @param outPadata The outPadata
+ * @throws KrbException e
*/
void tryFirst(KdcRequest kdcRequest,
PluginRequestContext requestContext,
@@ -76,7 +92,12 @@ public interface KrbPreauth extends PreauthPluginMeta {
/**
* Process server returned paData and return back any result paData
- * Return true indicating padata is added
+ * @param kdcRequest The kdc request
+ * @param requestContext The request context
+ * @param inPadata The inPadata
+ * @param outPadata The outPadata
+ * @return true indicating padata is added
+ * @throws KrbException e
*/
boolean process(KdcRequest kdcRequest,
PluginRequestContext requestContext,
@@ -85,7 +106,12 @@ public interface KrbPreauth extends PreauthPluginMeta {
/**
* When another request to server in the 4 pass, any paData to provide?
- * Return true indicating padata is added
+ * @param kdcRequest The kdc request
+ * @param requestContext The request context
+ * @param preauthType The preauth type
+ * @param errPadata The error padata
+ * @param outPadata The outPadata
+ * @return true indicating padata is added
*/
boolean tryAgain(KdcRequest kdcRequest,
PluginRequestContext requestContext,
@@ -96,6 +122,8 @@ public interface KrbPreauth extends PreauthPluginMeta {
/**
* Return PA_REAL if pa_type is a real preauthentication type or PA_INFO if it is
* an informational type.
+ * @param paType The pa_type
+ * @return PaFlags
*/
PaFlags getFlags(PaDataType paType);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/205295a8/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 50ae39f..9ee3340 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
@@ -323,6 +323,7 @@ public abstract class KdcRequest {
/**
* Indicate interest in the AS key.
+ * @throws KrbException e
*/
public void needAsKey() throws KrbException {
EncryptionKey clientKey = getClientKey();
@@ -337,6 +338,7 @@ public abstract class KdcRequest {
* the AS_REP packet. When handling a PREAUTH_REQUIRED error, this
* typically comes from etype-info2. When handling an AS reply, it is
* initialized from the AS reply itself.
+ * @return The encryption type
*/
public EncryptionType getEncType() {
@@ -349,6 +351,7 @@ public abstract class KdcRequest {
/**
* Get a pointer to the FAST armor key, or NULL if the client is not using FAST.
+ * @return The encryption key
*/
public EncryptionKey getArmorKey() {
return fastRequestState.getArmorKey();
@@ -363,6 +366,7 @@ public abstract class KdcRequest {
* will only be used if it is protected by a FAST channel. Only set
* allow_unauth_time if using an unauthenticated time offset would not
* create a security issue.
+ * @return The current kerberos time
*/
public KerberosTime getPreauthTime() {
return KerberosTime.now();
@@ -372,6 +376,8 @@ public abstract class KdcRequest {
* Get a state item from an input ccache, which may allow it
* to retrace the steps it took last time. The returned data string is an
* alias and should not be freed.
+ * @param key The key string
+ * @return The item
*/
public Object getCacheValue(String key) {
return credCache.get(key);
@@ -381,6 +387,8 @@ public abstract class KdcRequest {
* Set a state item which will be recorded to an output
* ccache, if the calling application supplied one. Both key and data
* should be valid UTF-8 text.
+ * @param key The key string
+ * @param value The value
*/
public void cacheValue(String key, Object value) {
credCache.put(key, value);
[32/46] directory-kerby git commit: Merge remote-tracking branch
'asf/master'
Posted by pl...@apache.org.
Merge remote-tracking branch 'asf/master'
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/844f82b2
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/844f82b2
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/844f82b2
Branch: refs/heads/pkinit-support
Commit: 844f82b2843a57ef754e17614a7ec04f76252f79
Parents: fd7f686 e0dd503
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 15:55:16 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 15:55:16 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/admin/Kadmin.java | 45 +++++++++++++-------
.../kerberos/kerb/server/SimpleKdcServer.java | 17 ++++++--
2 files changed, 44 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[02/46] directory-kerby git commit: refine BUILDING.md
Posted by pl...@apache.org.
refine BUILDING.md
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/2ce66c9f
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/2ce66c9f
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/2ce66c9f
Branch: refs/heads/pkinit-support
Commit: 2ce66c9f57c8cf08f1e5ccd7eca951c28eaaaaa8
Parents: 723f9a7
Author: YaningX <ya...@gmail.com>
Authored: Thu Aug 20 15:17:47 2015 +0800
Committer: YaningX <ya...@gmail.com>
Committed: Thu Aug 20 15:17:47 2015 +0800
----------------------------------------------------------------------
BUILDING.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2ce66c9f/BUILDING.txt
----------------------------------------------------------------------
diff --git a/BUILDING.txt b/BUILDING.txt
index 99f14a4..47c1e7b 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -1,5 +1,5 @@
#Build instructions for Kerby
-----------------
+-------------
###Requirements:
* JDK 1.7+
* Maven 3.0 or later
[03/46] directory-kerby git commit: Added the .pmd and
.pmdruleset.xml files into the rat exclusion set
Posted by pl...@apache.org.
Added the .pmd and .pmdruleset.xml files into the rat exclusion set
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/a9d5fd32
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a9d5fd32
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a9d5fd32
Branch: refs/heads/pkinit-support
Commit: a9d5fd3258f6177b00713a1adce227fa6c61f9d8
Parents: 2ce66c9
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 11:51:13 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 11:51:13 2015 +0200
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a9d5fd32/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 87bb01e..19d3f2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,10 @@
<exclude>kerby-dist/**/*</exclude>
<!-- BMP_IMAGES_EXCLUDES -->
<exclude>**/*.bmp</exclude>
+ <!-- PMD files -->
+ <exclude>**/.pmd</exclude>
+ <!-- PMD Ruleset files -->
+ <exclude>**/.pmdruleset.xml</exclude>
</excludes>
</configuration>
</plugin>
[04/46] directory-kerby git commit: Added a missing AL_2.0 header in
the log4j.properties file. Excluded the bin/ dir from the rat check
Posted by pl...@apache.org.
Added a missing AL_2.0 header in the log4j.properties file. Excluded the bin/ dir from the rat check
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/aee06fab
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/aee06fab
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/aee06fab
Branch: refs/heads/pkinit-support
Commit: aee06faba426849616a52c6030d2f86b3dc1f431
Parents: a9d5fd3
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 11:58:54 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 11:58:54 2015 +0200
----------------------------------------------------------------------
kerby-dist/kdc-dist/log4j.properties | 16 ++++++++++++++++
kerby-dist/tool-dist/log4j.properties | 16 ++++++++++++++++
pom.xml | 2 ++
3 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aee06fab/kerby-dist/kdc-dist/log4j.properties
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/log4j.properties b/kerby-dist/kdc-dist/log4j.properties
index dc84c55..a648fd5 100644
--- a/kerby-dist/kdc-dist/log4j.properties
+++ b/kerby-dist/kdc-dist/log4j.properties
@@ -1,3 +1,19 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
log4j.rootLogger=INFO,R
log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aee06fab/kerby-dist/tool-dist/log4j.properties
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/log4j.properties b/kerby-dist/tool-dist/log4j.properties
index dc84c55..a648fd5 100644
--- a/kerby-dist/tool-dist/log4j.properties
+++ b/kerby-dist/tool-dist/log4j.properties
@@ -1,3 +1,19 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
log4j.rootLogger=INFO,R
log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aee06fab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 19d3f2a..b99c1db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,8 @@
<exclude>**/.pmd</exclude>
<!-- PMD Ruleset files -->
<exclude>**/.pmdruleset.xml</exclude>
+ <!-- BIN files -->
+ <exclude>**/bin/**/*</exclude>
</excludes>
</configuration>
</plugin>
[46/46] directory-kerby git commit: Merge remote-tracking branch
'asf/master' into pkinit-support
Posted by pl...@apache.org.
Merge remote-tracking branch 'asf/master' into pkinit-support
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/00c4515c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/00c4515c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/00c4515c
Branch: refs/heads/pkinit-support
Commit: 00c4515cd47b34d2966478e8a78e1c1809af8943
Parents: 53d09c9 735fdf7
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Sep 9 09:41:39 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Sep 9 09:41:39 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
BUILDING.txt | 2 +-
benchmark/pom.xml | 3 +-
docs/kerby-ip-clearance.xml | 141 +++++++++++++++++++
kerby-asn1/pom.xml | 6 +-
.../java/org/apache/kerby/asn1/Asn1Factory.java | 4 +-
.../org/apache/kerby/asn1/Asn1InputBuffer.java | 13 +-
.../org/apache/kerby/asn1/EncodingOption.java | 2 +-
.../java/org/apache/kerby/asn1/TagClass.java | 4 +-
.../org/apache/kerby/asn1/TaggingOption.java | 16 +--
.../kerby/asn1/type/AbstractAsn1Type.java | 21 +--
.../org/apache/kerby/asn1/type/Asn1Boolean.java | 2 +-
.../kerby/asn1/type/Asn1GeneralizedTime.java | 1 +
.../org/apache/kerby/asn1/type/Asn1Simple.java | 15 +-
.../org/apache/kerby/asn1/type/Asn1Type.java | 32 ++---
.../apache/kerby/asn1/TestTaggingEncoding.java | 2 -
kerby-backend/json-backend/pom.xml | 2 +-
.../identitybackend/JsonIdentityBackend.java | 2 +-
kerby-backend/ldap-backend/pom.xml | 2 +-
.../identitybackend/LdapIdentityGetHelper.java | 18 +++
kerby-backend/mavibot-backend/pom.xml | 5 +-
.../java/org/apache/kerby/MavibotBackend.java | 2 +-
kerby-backend/pom.xml | 2 +-
kerby-backend/zookeeper-backend/pom.xml | 4 +-
.../identitybackend/IdentityZNodeHelper.java | 33 +++++
.../kerberos/kdc/identitybackend/ZKUtil.java | 39 ++++-
.../ZookeeperIdentityBackend.java | 2 +-
kerby-config/pom.xml | 6 +-
.../java/org/apache/kerby/config/Config.java | 40 +++---
kerby-dist/kdc-dist/bin/kadmin.sh | 7 +-
kerby-dist/kdc-dist/bin/kdcinit.sh | 7 +-
kerby-dist/kdc-dist/bin/start-kdc.sh | 7 +-
kerby-dist/kdc-dist/log4j.properties | 16 +++
kerby-dist/kdc-dist/pom.xml | 4 +-
kerby-dist/pom.xml | 8 +-
kerby-dist/tool-dist/bin/kinit.sh | 7 +-
kerby-dist/tool-dist/bin/klist.sh | 7 +-
kerby-dist/tool-dist/log4j.properties | 16 +++
kerby-dist/tool-dist/pom.xml | 4 +-
kerby-kdc-test/pom.xml | 4 +-
kerby-kdc/pom.xml | 4 +-
kerby-kerb/integration-test/pom.xml | 2 +-
.../integration/test/jaas/TokenJaasKrbUtil.java | 2 +
kerby-kerb/kerb-admin/pom.xml | 2 +-
.../kerby/kerberos/kerb/admin/Kadmin.java | 45 ++++--
kerby-kerb/kerb-client-api-all/pom.xml | 4 +-
kerby-kerb/kerb-client/pom.xml | 2 +-
.../kerby/kerberos/kerb/client/ClientUtil.java | 9 +-
.../kerby/kerberos/kerb/client/KrbClient.java | 70 ++++-----
.../kerby/kerberos/kerb/client/KrbConfig.java | 31 +++-
.../kerby/kerberos/kerb/client/KrbContext.java | 6 +
.../kerby/kerberos/kerb/client/KrbHandler.java | 3 +
.../kerby/kerberos/kerb/client/KrbSetting.java | 4 +-
.../kerb/client/impl/InternalKrbClient.java | 9 +-
.../kerb/client/preauth/KrbPreauth.java | 32 ++++-
.../kerb/client/preauth/PreauthHandler.java | 2 +
.../kerb/client/request/KdcRequest.java | 8 ++
kerby-kerb/kerb-common/pom.xml | 2 +-
.../kerby/kerberos/kerb/common/KrbUtil.java | 4 +-
.../kerb/transport/KdcUdpTransport.java | 2 +-
.../kerb/transport/KrbTcpTransport.java | 2 +-
.../kerberos/kerb/transport/KrbTransport.java | 10 +-
.../kerb/transport/KrbUdpTransport.java | 2 +-
kerby-kerb/kerb-core-test/pom.xml | 2 +-
kerby-kerb/kerb-core/pom.xml | 2 +-
.../apache/kerby/kerberos/kerb/KrbRuntime.java | 2 +
.../kerby/kerberos/kerb/provider/PkiLoader.java | 24 ++--
.../kerberos/kerb/provider/TokenDecoder.java | 6 +-
.../kerberos/kerb/provider/TokenEncoder.java | 6 +-
.../kerby/kerberos/kerb/spec/KerberosTime.java | 15 +-
.../kerberos/kerb/spec/base/AuthToken.java | 16 +--
.../kerby/kerberos/kerb/spec/base/KrbToken.java | 6 +
kerby-kerb/kerb-crypto/pom.xml | 2 +-
.../kerberos/kerb/crypto/EncryptionHandler.java | 115 ++++++++++++++-
.../kerberos/kerb/crypto/fast/FastUtil.java | 18 ++-
.../kerb/crypto/key/AbstractKeyMaker.java | 5 +-
.../kerberos/kerb/crypto/key/DesKeyMaker.java | 9 +-
.../kerberos/kerb/crypto/random/JavaRandom.java | 3 +-
.../kerb/crypto/random/RandomProvider.java | 4 +-
.../kerberos/kerb/crypto/util/Camellia.java | 8 ++
.../kerby/kerberos/kerb/crypto/util/Des.java | 3 +
.../kerby/kerberos/kerb/crypto/util/Nfold.java | 5 +-
kerby-kerb/kerb-identity-test/pom.xml | 2 +-
.../kerb/identity/backend/BackendTestBase.java | 1 +
kerby-kerb/kerb-identity/pom.xml | 2 +-
.../kerberos/kerb/identity/IdentityService.java | 14 +-
.../backend/AbstractIdentityBackend.java | 20 ++-
.../kerb/identity/backend/IdentityBackend.java | 2 +
kerby-kerb/kerb-kdc-test/pom.xml | 2 +-
kerby-kerb/kerb-server-api-all/pom.xml | 4 +-
kerby-kerb/kerb-server/pom.xml | 4 +-
.../kerby/kerberos/kerb/server/KdcHandler.java | 12 +-
.../kerby/kerberos/kerb/server/KdcServer.java | 38 +++--
.../kerby/kerberos/kerb/server/KdcSetting.java | 37 ++++-
.../kerby/kerberos/kerb/server/KdcUtil.java | 20 ++-
.../kerb/server/impl/InternalKdcServer.java | 3 +
.../kerb/server/preauth/KdcPreauth.java | 20 +++
.../kerb/server/preauth/PreauthHandler.java | 2 +-
.../kerberos/kerb/server/request/AsRequest.java | 1 +
.../kerb/server/request/KdcRequest.java | 116 ++++++++++++++-
.../kerb/server/request/TgsRequest.java | 11 ++
kerby-kerb/kerb-simplekdc/pom.xml | 2 +-
.../kerberos/kerb/server/SimpleKdcServer.java | 18 ++-
kerby-kerb/kerb-util/pom.xml | 2 +-
kerby-kerb/pom.xml | 4 +-
kerby-provider/pom.xml | 8 +-
kerby-provider/token-provider/pom.xml | 6 +-
.../provider/token/JwtTokenDecoder.java | 6 +-
.../kerby/kerberos/provider/token/JwtUtil.java | 3 +-
kerby-tool/client-tool/pom.xml | 4 +-
.../apache/kerby/kerberos/tool/ToolUtil.java | 2 +-
kerby-tool/kdc-tool/pom.xml | 2 +-
.../tool/kadmin/command/KadminCommand.java | 1 +
kerby-tool/pom.xml | 2 +-
kerby-util/pom.xml | 2 +-
.../src/main/java/org/apache/kerby/KOption.java | 3 +-
.../main/java/org/apache/kerby/KOptions.java | 4 +-
.../main/java/org/apache/kerby/util/Base64.java | 10 +-
.../apache/kerby/util/Base64InputStream.java | 4 +-
.../apache/kerby/util/Base64OutputStream.java | 4 +-
.../java/org/apache/kerby/util/HexUtil.java | 4 +
.../main/java/org/apache/kerby/util/IOUtil.java | 18 +--
pom.xml | 117 +++++++--------
123 files changed, 1149 insertions(+), 405 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/00c4515c/kerby-kdc-test/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/00c4515c/kerby-provider/pom.xml
----------------------------------------------------------------------
diff --cc kerby-provider/pom.xml
index 7aade63,1519bd3..a23352e
--- a/kerby-provider/pom.xml
+++ b/kerby-provider/pom.xml
@@@ -28,7 -26,6 +26,7 @@@
<modules>
<module>token-provider</module>
+ <module>pki-provider</module>
</modules>
- </project>
+ </project>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/00c4515c/kerby-tool/client-tool/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/00c4515c/pom.xml
----------------------------------------------------------------------
[11/46] directory-kerby git commit: fixed a version
Posted by pl...@apache.org.
fixed a version
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/59ffd0e4
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/59ffd0e4
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/59ffd0e4
Branch: refs/heads/pkinit-support
Commit: 59ffd0e4e189bbcbbdba8ad338cce53a015fe7ed
Parents: 1134d21
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 16:04:11 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 16:04:11 2015 +0200
----------------------------------------------------------------------
kerby-provider/token-provider/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/59ffd0e4/kerby-provider/token-provider/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/pom.xml b/kerby-provider/token-provider/pom.xml
index 60fd64d..530a45c 100644
--- a/kerby-provider/token-provider/pom.xml
+++ b/kerby-provider/token-provider/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>kerby-provider</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0.0-RC1@-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[41/46] directory-kerby git commit: [maven-release-plugin] prepare
for next development iteration
Posted by pl...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/c3afd728
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/c3afd728
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/c3afd728
Branch: refs/heads/pkinit-support
Commit: c3afd7288c86f6adf8ba9684c8a486ffc1c31d4b
Parents: c49e9d4
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Sep 5 11:41:39 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Sep 5 11:41:39 2015 +0200
----------------------------------------------------------------------
benchmark/pom.xml | 2 +-
kerby-asn1/pom.xml | 2 +-
kerby-backend/json-backend/pom.xml | 2 +-
kerby-backend/ldap-backend/pom.xml | 2 +-
kerby-backend/mavibot-backend/pom.xml | 2 +-
kerby-backend/pom.xml | 2 +-
kerby-backend/zookeeper-backend/pom.xml | 2 +-
kerby-config/pom.xml | 2 +-
kerby-dist/kdc-dist/pom.xml | 2 +-
kerby-dist/pom.xml | 2 +-
kerby-dist/tool-dist/pom.xml | 2 +-
kerby-kdc-test/pom.xml | 2 +-
kerby-kdc/pom.xml | 2 +-
kerby-kerb/integration-test/pom.xml | 2 +-
kerby-kerb/kerb-admin/pom.xml | 2 +-
kerby-kerb/kerb-client-api-all/pom.xml | 2 +-
kerby-kerb/kerb-client/pom.xml | 2 +-
kerby-kerb/kerb-common/pom.xml | 2 +-
kerby-kerb/kerb-core-test/pom.xml | 2 +-
kerby-kerb/kerb-core/pom.xml | 2 +-
kerby-kerb/kerb-crypto/pom.xml | 2 +-
kerby-kerb/kerb-identity-test/pom.xml | 2 +-
kerby-kerb/kerb-identity/pom.xml | 2 +-
kerby-kerb/kerb-kdc-test/pom.xml | 2 +-
kerby-kerb/kerb-server-api-all/pom.xml | 2 +-
kerby-kerb/kerb-server/pom.xml | 2 +-
kerby-kerb/kerb-simplekdc/pom.xml | 2 +-
kerby-kerb/kerb-util/pom.xml | 2 +-
kerby-kerb/pom.xml | 2 +-
kerby-provider/pom.xml | 2 +-
kerby-provider/token-provider/pom.xml | 2 +-
kerby-tool/client-tool/pom.xml | 2 +-
kerby-tool/kdc-tool/pom.xml | 2 +-
kerby-tool/pom.xml | 2 +-
kerby-util/pom.xml | 2 +-
pom.xml | 4 ++--
36 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index cac3d86..ace11bf 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>kerby-all</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-asn1/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-asn1/pom.xml b/kerby-asn1/pom.xml
index 718b0d0..b89e06a 100644
--- a/kerby-asn1/pom.xml
+++ b/kerby-asn1/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-backend/json-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/pom.xml b/kerby-backend/json-backend/pom.xml
index f9bf4f3..f1f6e1f 100644
--- a/kerby-backend/json-backend/pom.xml
+++ b/kerby-backend/json-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>json-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-backend/ldap-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/ldap-backend/pom.xml b/kerby-backend/ldap-backend/pom.xml
index 2e0c5aa..7c3ae0f 100644
--- a/kerby-backend/ldap-backend/pom.xml
+++ b/kerby-backend/ldap-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>ldap-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-backend/mavibot-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot-backend/pom.xml b/kerby-backend/mavibot-backend/pom.xml
index e0fd72f..71a7454 100644
--- a/kerby-backend/mavibot-backend/pom.xml
+++ b/kerby-backend/mavibot-backend/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>mavibot-backend</artifactId>
<name>Mavibot based backend</name>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/pom.xml b/kerby-backend/pom.xml
index 15f8fdb..1305721 100644
--- a/kerby-backend/pom.xml
+++ b/kerby-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerby-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-backend/zookeeper-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/pom.xml b/kerby-backend/zookeeper-backend/pom.xml
index d0a701c..03b7cac 100644
--- a/kerby-backend/zookeeper-backend/pom.xml
+++ b/kerby-backend/zookeeper-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-config/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-config/pom.xml b/kerby-config/pom.xml
index bca15e1..41b7dc1 100644
--- a/kerby-config/pom.xml
+++ b/kerby-config/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index 2617960..b464e43 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-dist</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kdc-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/pom.xml b/kerby-dist/pom.xml
index f6dcb1e..6fc0948 100644
--- a/kerby-dist/pom.xml
+++ b/kerby-dist/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerby-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-dist/tool-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/pom.xml b/kerby-dist/tool-dist/pom.xml
index 8a4144b..7bf67ce 100644
--- a/kerby-dist/tool-dist/pom.xml
+++ b/kerby-dist/tool-dist/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-dist</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>tool-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kdc-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/pom.xml b/kerby-kdc-test/pom.xml
index 2acd191..a5d983c 100644
--- a/kerby-kdc-test/pom.xml
+++ b/kerby-kdc-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerby-kdc-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc/pom.xml b/kerby-kdc/pom.xml
index b0417db..ed222ec 100644
--- a/kerby-kdc/pom.xml
+++ b/kerby-kdc/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerby-kdc</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/pom.xml b/kerby-kerb/integration-test/pom.xml
index 0af11d9..d73c192 100644
--- a/kerby-kerb/integration-test/pom.xml
+++ b/kerby-kerb/integration-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>integration-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-admin/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin/pom.xml b/kerby-kerb/kerb-admin/pom.xml
index da16b90..effc642 100644
--- a/kerby-kerb/kerb-admin/pom.xml
+++ b/kerby-kerb/kerb-admin/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-admin</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-client-api-all/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client-api-all/pom.xml b/kerby-kerb/kerb-client-api-all/pom.xml
index aa3a48e..41fb292 100644
--- a/kerby-kerb/kerb-client-api-all/pom.xml
+++ b/kerby-kerb/kerb-client-api-all/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-client-api-all</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-client/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/pom.xml b/kerby-kerb/kerb-client/pom.xml
index 3208405..d75eaea 100644
--- a/kerby-kerb/kerb-client/pom.xml
+++ b/kerby-kerb/kerb-client/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-client</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-common/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/pom.xml b/kerby-kerb/kerb-common/pom.xml
index 45d2894..e896aed 100644
--- a/kerby-kerb/kerb-common/pom.xml
+++ b/kerby-kerb/kerb-common/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-common</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-core-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/pom.xml b/kerby-kerb/kerb-core-test/pom.xml
index 8940d99..d796f98 100644
--- a/kerby-kerb/kerb-core-test/pom.xml
+++ b/kerby-kerb/kerb-core-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-core-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-core/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/pom.xml b/kerby-kerb/kerb-core/pom.xml
index 07c819f..1eb5140 100644
--- a/kerby-kerb/kerb-core/pom.xml
+++ b/kerby-kerb/kerb-core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-core</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/pom.xml b/kerby-kerb/kerb-crypto/pom.xml
index 539de46..94c3a80 100644
--- a/kerby-kerb/kerb-crypto/pom.xml
+++ b/kerby-kerb/kerb-crypto/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-crypto</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-identity-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity-test/pom.xml b/kerby-kerb/kerb-identity-test/pom.xml
index 871c3aa..abb4138 100644
--- a/kerby-kerb/kerb-identity-test/pom.xml
+++ b/kerby-kerb/kerb-identity-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-identity-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-identity/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity/pom.xml b/kerby-kerb/kerb-identity/pom.xml
index 6905cc3..f1dd25a 100644
--- a/kerby-kerb/kerb-identity/pom.xml
+++ b/kerby-kerb/kerb-identity/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-identity</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-kdc-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/pom.xml b/kerby-kerb/kerb-kdc-test/pom.xml
index 8a8cbbe..fae0ea9 100644
--- a/kerby-kerb/kerb-kdc-test/pom.xml
+++ b/kerby-kerb/kerb-kdc-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-kdc-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-server-api-all/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server-api-all/pom.xml b/kerby-kerb/kerb-server-api-all/pom.xml
index d5e3c66..fccc515 100644
--- a/kerby-kerb/kerb-server-api-all/pom.xml
+++ b/kerby-kerb/kerb-server-api-all/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-server-api-all</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-server/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/pom.xml b/kerby-kerb/kerb-server/pom.xml
index 139d215..edb355c 100644
--- a/kerby-kerb/kerb-server/pom.xml
+++ b/kerby-kerb/kerb-server/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-server</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-simplekdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/pom.xml b/kerby-kerb/kerb-simplekdc/pom.xml
index 1e9ce65..9e23c69 100644
--- a/kerby-kerb/kerb-simplekdc/pom.xml
+++ b/kerby-kerb/kerb-simplekdc/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-simplekdc</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/kerb-util/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/pom.xml b/kerby-kerb/kerb-util/pom.xml
index 4bd4f15..9c2afc7 100644
--- a/kerby-kerb/kerb-util/pom.xml
+++ b/kerby-kerb/kerb-util/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerb-util</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-kerb/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/pom.xml b/kerby-kerb/pom.xml
index 32bc10a..768d899 100644
--- a/kerby-kerb/pom.xml
+++ b/kerby-kerb/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerby-kerb</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-provider/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-provider/pom.xml b/kerby-provider/pom.xml
index 7b2bfa7..1519bd3 100644
--- a/kerby-provider/pom.xml
+++ b/kerby-provider/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>kerby-all</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-provider/token-provider/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/pom.xml b/kerby-provider/token-provider/pom.xml
index d51992a..74729c6 100644
--- a/kerby-provider/token-provider/pom.xml
+++ b/kerby-provider/token-provider/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>kerby-provider</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-tool/client-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/pom.xml b/kerby-tool/client-tool/pom.xml
index adef01f..b6fb6d1 100644
--- a/kerby-tool/client-tool/pom.xml
+++ b/kerby-tool/client-tool/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-tool</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>client-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-tool/kdc-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/kdc-tool/pom.xml b/kerby-tool/kdc-tool/pom.xml
index 7afb9ea..33f8eff 100644
--- a/kerby-tool/kdc-tool/pom.xml
+++ b/kerby-tool/kdc-tool/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-tool</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kdc-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/pom.xml b/kerby-tool/pom.xml
index 3721fb9..b834f66 100644
--- a/kerby-tool/pom.xml
+++ b/kerby-tool/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerby-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/kerby-util/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-util/pom.xml b/kerby-util/pom.xml
index 4f156d1..8756dc1 100644
--- a/kerby-util/pom.xml
+++ b/kerby-util/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
</parent>
<artifactId>kerby-util</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c3afd728/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index feee170..306befd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Kerby Project</name>
@@ -36,7 +36,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-kerby.git</connection>
<url>https://github.com/apache/directory-kerby</url>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-kerby.git</developerConnection>
- <tag>kerby-all-1.0.0-RC1</tag>
+ <tag>HEAD</tag>
</scm>
<distributionManagement>
[39/46] directory-kerby git commit: Exclude .checkstyle files from
RAT check. Activate RAT check during release build.
Posted by pl...@apache.org.
Exclude .checkstyle files from RAT check. Activate RAT check during release build.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1ba12044
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1ba12044
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1ba12044
Branch: refs/heads/pkinit-support
Commit: 1ba12044d6ba4d17e1f1b5c85065fabf5cb4077f
Parents: 782cc0d
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Tue Aug 25 21:08:43 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Tue Aug 25 21:15:12 2015 +0200
----------------------------------------------------------------------
pom.xml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1ba12044/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 60a9013..274ee8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,8 @@
<exclude>**/.pmd</exclude>
<!-- PMD Ruleset files -->
<exclude>**/.pmdruleset.xml</exclude>
+ <!-- Checkstyle files -->
+ <exclude>**/.checkstyle</exclude>
<!-- BIN files -->
<exclude>**/bin/**/*</exclude>
</excludes>
@@ -353,6 +355,28 @@
<checkstyle.suppressions.location>${basedir}/src/checkstyle/suppressions.xml</checkstyle.suppressions.location>
</properties>
</profile>
+
+ <!-- Override of the 'apache-release' profile, used to launch the Apache RAT plugin -->
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
<repositories>
[45/46] directory-kerby git commit: Added a draft for the ip
clearance doc
Posted by pl...@apache.org.
Added a draft for the ip clearance doc
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/735fdf79
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/735fdf79
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/735fdf79
Branch: refs/heads/pkinit-support
Commit: 735fdf7907dbfa6b2dce6d37d9d6e331d465cc80
Parents: 4cc13b9
Author: drankye <ka...@intel.com>
Authored: Mon Sep 7 18:48:41 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Mon Sep 7 18:48:41 2015 +0800
----------------------------------------------------------------------
docs/kerby-ip-clearance.xml | 141 +++++++++++++++++++++++++++++++++++++++
1 file changed, 141 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/735fdf79/docs/kerby-ip-clearance.xml
----------------------------------------------------------------------
diff --git a/docs/kerby-ip-clearance.xml b/docs/kerby-ip-clearance.xml
new file mode 100644
index 0000000..28a61c8
--- /dev/null
+++ b/docs/kerby-ip-clearance.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+ <properties>
+ <title>Kerby Codebase Intellectual Property (IP) Clearance Status</title>
+ </properties>
+ <body>
+ <section id="Codebase+IP+Clearance+TEMPLATE">
+ <title>Codebase IP Clearance</title>
+ </section>
+ <section id="FortressCodebase+Intellectual+Property+%28IP%29+Clearance+Status">
+ <title>Kerby Codebase Intellectual Property (IP) Clearance Status</title>
+ </section>
+ <section id="Description">
+ <title>Description</title>
+ <p>Apache Kerby™, or simply Kerby, is a Java Kerberos binding.
+ It provides a rich, intuitive and interoperable implementation,
+ library, KDC and various facilities that integrates PKI, OTP and
+ token (OAuth2) as desired in modern environments such as cloud, Hadoop and mobile..</p>
+ </section>
+ <section id="Project+info">
+ <title>Project info</title>
+ <ul>
+ <li>Which PMC will be responsible for the code: Apache Directory PMC</li>
+ </ul>
+ <ul>
+ <li>Into which existing project/module: Kerby will go into its own project</li>
+ </ul>
+ <ul>
+ <li>Officer or member managing donation: Emmanuel Lecharny</li>
+ </ul>
+ <p>
+ <em>Completed tasks are shown by the completion date (YYYY-MM-dd).</em>
+ </p>
+ <section id="Identify+the+codebase">
+ <title>Identify the codebase</title>
+ <table>
+ <tr>
+ <th>date</th>
+ <th>item</th>
+ </tr>
+ <tr>
+ <td>2015-01-11</td>
+ <td>The code has been injected in the following git repo :
+ https://git-wip-us.apache.org/repos/asf/directory-kerby.git with all its history</td>
+ </tr>
+ </table>
+ <p>
+ MD5 or SHA1 sum for donated software: 23c1fd120d770c01b7513849c69badfff8eca8fd
+ </p>
+ <section id="Copyright">
+ <title>Copyright</title>
+ <table>
+ <tr>
+ <th>date</th>
+ <th>item</th>
+ </tr>
+ <tr>
+ <td>2015-01-10</td>
+ <td>Check and make sure that the papers that transfer rights to the ASF been received.
+ It is only necessary to transfer rights for the package, the core code, and any
+ new code produced by the project.</td>
+ </tr>
+ <tr>
+ <td>2015-01-13 </td>
+ <td>Check and make sure that the files that have been donated have been updated to
+ reflect the new ASF copyright.</td>
+ </tr>
+ </table>
+ <p>
+ Identify name recorded for software grant:
+ <em>the name of the grant as record in the grants.txt document so that the grant can be easily identified</em>
+ </p>
+ </section>
+ <section id="Verify+distribution+rights">
+ <title>Verify distribution rights</title>
+ <p>
+ Individuals holding existing distribution rights:
+ </p>
+ <ul>
+ <li>
+ o Kai Zheng (drankye)
+ </li>
+ </ul>
+ <table>
+ <tr>
+ <th>date</th>
+ <th>item</th>
+ </tr>
+ <tr>
+ <td>2015-09-06</td>
+ <td>
+ <p>Check that all active committers have a signed CLA on record.</p>
+ <p>All of the committers have a CLA on file at Apache</p>
+ </td>
+ </tr>
+ <tr>
+ <td>2015-09-05</td>
+ <td>Remind active committers that they are responsible for
+ ensuring that a Corporate CLA is recorded if such is
+ required to authorize their contributions under their
+ individual CLA.</td>
+ </tr>
+ <tr>
+ <td>2015-08-25</td>
+ <td>Check and make sure that for all items included with the
+ distribution that is not under the Apache license, we have
+ the right to combine with Apache-licensed code and
+ redistribute.</td>
+ </tr>
+ <tr>
+ <td>2015-08-25</td>
+ <td>Check and make sure that all items depended upon by the
+ project is covered by one or more of the following approved
+ licenses: Apache, BSD, Artistic, MIT/X, MIT/W3C, MPL 1.1, or
+ something with essentially the same terms.</td>
+ </tr>
+ </table>
+ <p>Generally, the result of checking off these items will be a
+ Software Grant, CLA, and Corporate CLA for ASF licensed code,
+ which must have no dependencies upon items whose licenses that
+ are incompatible with the Apache License.</p>
+ </section>
+ </section>
+ <section id="Organizational+acceptance+of+responsibility+for+the+project">
+ <title>Organizational acceptance of responsibility for the project
+ </title>
+ <p>
+ Related VOTEs:
+ </p>
+ <ul>
+ <li>
+ o Vote on dev@directory.apache.org Message-ID : <54A15B89.4060104@gmail.com>
+ </li>
+ <li>
+ o Vote result on dev@directory.apache.org Message-ID : <54A44594.1040708@gmail.com>
+ </li>
+ </ul>
+ </section>
+ </section>
+ </body>
+</document>
\ No newline at end of file
[13/46] directory-kerby git commit: fixed a typo
Posted by pl...@apache.org.
fixed a typo
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/81f0c95b
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/81f0c95b
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/81f0c95b
Branch: refs/heads/pkinit-support
Commit: 81f0c95b1c487d52c6a35416f7271f1eb1f6b782
Parents: 01aa381
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 16:11:47 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 16:11:47 2015 +0200
----------------------------------------------------------------------
kerby-util/src/main/java/org/apache/kerby/KOption.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/81f0c95b/kerby-util/src/main/java/org/apache/kerby/KOption.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/KOption.java b/kerby-util/src/main/java/org/apache/kerby/KOption.java
index 21e1205..84ccb97 100644
--- a/kerby-util/src/main/java/org/apache/kerby/KOption.java
+++ b/kerby-util/src/main/java/org/apache/kerby/KOption.java
@@ -87,5 +87,5 @@ public interface KOption {
* @return The value
*/
Object getValue();
-}q
+}
[36/46] directory-kerby git commit: Fix some javadoc issues.
Posted by pl...@apache.org.
Fix some javadoc issues.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/28e7a0c7
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/28e7a0c7
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/28e7a0c7
Branch: refs/heads/pkinit-support
Commit: 28e7a0c7c5780b61965a619fb33f4620ce52bcc5
Parents: a4825f0
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Aug 25 09:30:45 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Aug 25 09:30:45 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/server/KdcServer.java | 28 ++++++++++----------
.../kerb/server/impl/InternalKdcServer.java | 3 +++
.../kerb/server/preauth/KdcPreauth.java | 5 ++++
.../kerb/server/preauth/PreauthHandler.java | 2 +-
.../kerb/server/request/KdcRequest.java | 5 +++-
5 files changed, 27 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28e7a0c7/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 3d4f7b9..f90e1ee 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
@@ -41,9 +41,9 @@ public class KdcServer {
/**
* Constructor passing both kdcConfig and backendConfig.
- * @param kdcConfig
- * @param backendConfig
- * @throws KrbException
+ * @param kdcConfig The kdc config
+ * @param backendConfig The backend config
+ * @throws KrbException e
*/
public KdcServer(KdcConfig kdcConfig,
BackendConfig backendConfig) throws KrbException {
@@ -59,8 +59,8 @@ public class KdcServer {
* kdc.conf, that contains kdc server related items.
* backend.conf, that contains identity backend related items.
*
- * @param confDir
- * @throws KrbException
+ * @param confDir The conf dir
+ * @throws KrbException e
*/
public KdcServer(File confDir) throws KrbException {
KdcConfig tmpKdcConfig = KdcUtil.getKdcConfig(confDir);
@@ -92,7 +92,7 @@ public class KdcServer {
/**
* Set KDC realm for ticket request
- * @param realm
+ * @param realm The kdc realm
*/
public void setKdcRealm(String realm) {
startupOptions.add(KdcServerOption.KDC_REALM, realm);
@@ -100,7 +100,7 @@ public class KdcServer {
/**
* Set KDC host.
- * @param kdcHost
+ * @param kdcHost The kdc host
*/
public void setKdcHost(String kdcHost) {
startupOptions.add(KdcServerOption.KDC_HOST, kdcHost);
@@ -108,7 +108,7 @@ public class KdcServer {
/**
* Set KDC port.
- * @param kdcPort
+ * @param kdcPort The kdc port
*/
public void setKdcPort(int kdcPort) {
startupOptions.add(KdcServerOption.KDC_PORT, kdcPort);
@@ -116,7 +116,7 @@ public class KdcServer {
/**
* Set KDC tcp port.
- * @param kdcTcpPort
+ * @param kdcTcpPort The kdc tcp port
*/
public void setKdcTcpPort(int kdcTcpPort) {
startupOptions.add(KdcServerOption.KDC_TCP_PORT, kdcTcpPort);
@@ -124,7 +124,7 @@ public class KdcServer {
/**
* Set to allow UDP or not.
- * @param allowUdp
+ * @param allowUdp true if allow udp
*/
public void setAllowUdp(boolean allowUdp) {
startupOptions.add(KdcServerOption.ALLOW_UDP, allowUdp);
@@ -132,14 +132,14 @@ public class KdcServer {
/**
* Set to allow TCP or not.
- * @param allowTcp
+ * @param allowTcp true if allow tcp
*/
public void setAllowTcp(boolean allowTcp) {
startupOptions.add(KdcServerOption.ALLOW_TCP, allowTcp);
}
/**
* Set KDC udp port. Only makes sense when allowUdp is set.
- * @param kdcUdpPort
+ * @param kdcUdpPort The kdc udp port
*/
public void setKdcUdpPort(int kdcUdpPort) {
startupOptions.add(KdcServerOption.KDC_UDP_PORT, kdcUdpPort);
@@ -147,7 +147,7 @@ public class KdcServer {
/**
* Set runtime folder.
- * @param workDir
+ * @param workDir The work dir
*/
public void setWorkDir(File workDir) {
startupOptions.add(KdcServerOption.WORK_DIR, workDir);
@@ -163,7 +163,7 @@ public class KdcServer {
/**
* Allow to hook customized kdc implementation.
*
- * @param innerKdcImpl
+ * @param innerKdcImpl The inner kdc implementation
*/
public void setInnerKdcImpl(InternalKdcServer innerKdcImpl) {
startupOptions.add(KdcServerOption.INNER_KDC_IMPL, innerKdcImpl);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28e7a0c7/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/impl/InternalKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/impl/InternalKdcServer.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/impl/InternalKdcServer.java
index 7d2f022..0ed33dd 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/impl/InternalKdcServer.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/impl/InternalKdcServer.java
@@ -30,16 +30,19 @@ public interface InternalKdcServer {
/**
* Initialize.
+ * @throws KrbException e
*/
void init() throws KrbException;
/**
* Start the KDC server.
+ * @throws KrbException e
*/
void start() throws KrbException;
/**
* Stop the KDC server.
+ * @throws KrbException e
*/
void stop() throws KrbException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28e7a0c7/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java
index de862b3..a18e5d0 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java
@@ -43,6 +43,7 @@ public interface KdcPreauth extends PreauthPluginMeta {
/**
* Initializing request context
* @param kdcRequest kdc context
+ * @return request context
*/
PluginRequestContext initRequestContext(KdcRequest kdcRequest);
@@ -53,6 +54,7 @@ public interface KdcPreauth extends PreauthPluginMeta {
* @param kdcRequest kdc request
* @param requestContext request context
* @param outPaData out preauthentication data
+ * @throws KrbException e
*/
void provideEdata(KdcRequest kdcRequest, PluginRequestContext requestContext,
PaData outPaData) throws KrbException;
@@ -64,6 +66,8 @@ public interface KdcPreauth extends PreauthPluginMeta {
* @param kdcRequest kdc request
* @param requestContext request context
* @param paData preauthentication data
+ * @return true if verify success
+ * @throws KrbException e
*/
boolean verify(KdcRequest kdcRequest, PluginRequestContext requestContext,
PaDataEntry paData) throws KrbException;
@@ -84,6 +88,7 @@ public interface KdcPreauth extends PreauthPluginMeta {
* @param kdcRequest kdc request
* @param requestContext request context
* @param paType preauthentication type
+ * @return PaFlags
*/
PaFlags getFlags(KdcRequest kdcRequest, PluginRequestContext requestContext,
PaDataType paType);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28e7a0c7/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/PreauthHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/PreauthHandler.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/PreauthHandler.java
index ccd7a2e..cff6ba6 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/PreauthHandler.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/PreauthHandler.java
@@ -58,7 +58,7 @@ public class PreauthHandler {
/**
* Should be called per realm
- * @param context
+ * @param context The kdc context
*/
public void initWith(KdcContext context) {
for (KdcPreauth preauth : preauths) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/28e7a0c7/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
index 191fdfa..47025aa 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
@@ -105,6 +105,7 @@ public abstract class KdcRequest {
/**
* Set session key.
+ * @param sessionKey The session key
*/
public void setSessionKey(EncryptionKey sessionKey) {
this.sessionKey = sessionKey;
@@ -445,6 +446,7 @@ public abstract class KdcRequest {
/**
* Get server key.
+ * @return The server key
*/
public EncryptionKey getServerKey() {
return serverKey;
@@ -694,7 +696,7 @@ public abstract class KdcRequest {
/**
* Get identity entry with principal name.
*
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
* @param principal Principal
* @return krb identity entry
*/
@@ -772,6 +774,7 @@ public abstract class KdcRequest {
/**
* Set auth token.
+ * @param authToken The auth token
*/
public void setToken(AuthToken authToken) {
this.token = authToken;
[38/46] directory-kerby git commit: Remove the maven-jar-plugin,
maven-compiler-plugin and apache-rat-plugint declaration.
Posted by pl...@apache.org.
Remove the maven-jar-plugin, maven-compiler-plugin and apache-rat-plugint declaration.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/782cc0d7
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/782cc0d7
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/782cc0d7
Branch: refs/heads/pkinit-support
Commit: 782cc0d7c35af488bc8bfb23c761e35f6d0fb5da
Parents: 5dc62bb
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Aug 25 21:05:30 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Aug 25 21:05:30 2015 +0800
----------------------------------------------------------------------
pom.xml | 22 ----------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/782cc0d7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f13929..60a9013 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,11 +160,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -294,23 +289,6 @@
</pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[23/46] directory-kerby git commit: add JavaDoc for json-backend
Posted by pl...@apache.org.
add JavaDoc for json-backend
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/bbc8ecf2
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/bbc8ecf2
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/bbc8ecf2
Branch: refs/heads/pkinit-support
Commit: bbc8ecf29647c67b1a783402c583cb35981d09e4
Parents: b1815d6
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 14:07:28 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 14:07:28 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kdc/identitybackend/JsonIdentityBackend.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/bbc8ecf2/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 f810c4a..e4eaf22 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
@@ -68,7 +68,7 @@ public class JsonIdentityBackend extends AbstractIdentityBackend {
/**
* Constructing an instance using specified config that contains anything
* to be used to initialize the json format database.
- * @param config
+ * @param config The configuration for json identity backend
*/
public JsonIdentityBackend(Config config) {
setConfig(config);
[22/46] directory-kerby git commit: Fix javadoc issues in
kerb-identity module.
Posted by pl...@apache.org.
Fix javadoc issues in kerb-identity module.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4f822df7
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4f822df7
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4f822df7
Branch: refs/heads/pkinit-support
Commit: 4f822df73065a10b52504eea40eb39f83fe13879
Parents: 9013961
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 14:06:02 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 14:06:02 2015 +0800
----------------------------------------------------------------------
.../kerberos/kerb/identity/IdentityService.java | 14 +++++++++-----
.../identity/backend/AbstractIdentityBackend.java | 18 ++++++++++++++----
.../kerb/identity/backend/IdentityBackend.java | 2 ++
3 files changed, 25 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4f822df7/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/IdentityService.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/IdentityService.java b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/IdentityService.java
index a18b316..3d2e7dd 100644
--- a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/IdentityService.java
+++ b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/IdentityService.java
@@ -30,34 +30,38 @@ public interface IdentityService {
* Get all of the identity principal names.
* Note it's ordered by principal name.
* @return principal names
+ * @throws KrbException e
*/
Iterable<String> getIdentities() throws KrbException;
/**
* Get the identity account specified by name.
- * @param principalName
+ * @param principalName The principal name
* @return identity
+ * @throws KrbException e
*/
KrbIdentity getIdentity(String principalName) throws KrbException;
/**
* Add an identity, and return the newly created result.
- * @param identity
+ * @param identity The identity
* @return identity
+ * @throws KrbException e
*/
KrbIdentity addIdentity(KrbIdentity identity) throws KrbException;
/**
* Update an identity, and return the updated result.
- * @param identity
+ * @param identity The identity
* @return identity
+ * @throws KrbException e
*/
KrbIdentity updateIdentity(KrbIdentity identity) throws KrbException;
/**
* Delete the identity specified by principal name
- * @param principalName
- *
+ * @param principalName The principal name
+ * @throws KrbException e
*/
void deleteIdentity(String principalName) throws KrbException;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4f822df7/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
index 2ed1848..5f967cc 100644
--- a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
+++ b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
@@ -40,6 +40,7 @@ public abstract class AbstractIdentityBackend
/**
* Get the Backend Config.
+ * @return The backend config
*/
protected BackendConfig getBackendConfig() {
return (BackendConfig) getConfig();
@@ -56,6 +57,7 @@ public abstract class AbstractIdentityBackend
/**
* Perform the real initialization work for the backend.
+ * @throws KrbException e
*/
protected void doInitialize() throws KrbException { }
@@ -84,6 +86,7 @@ public abstract class AbstractIdentityBackend
/**
* Perform the real stop work for the backend.
+ * @throws KrbException e
*/
protected void doStop() throws KrbException { }
@@ -112,6 +115,8 @@ public abstract class AbstractIdentityBackend
/**
* Perform the real work to get identities.
+ * @return The identities
+ * @throws KrbException e
*/
protected abstract Iterable<String> doGetIdentities() throws KrbException;
@@ -135,7 +140,8 @@ public abstract class AbstractIdentityBackend
/**
* Add an identity, invoked by addIdentity.
- * @param principalName
+ * @param principalName The principal name
+ * @throws KrbException e
*/
protected abstract KrbIdentity doGetIdentity(String principalName) throws KrbException;
@@ -161,7 +167,8 @@ public abstract class AbstractIdentityBackend
/**
* Add an identity, invoked by addIdentity, and return added identity.
- * @param identity
+ * @param identity The identity to be added
+ * @throws KrbException e
*/
protected abstract KrbIdentity doAddIdentity(KrbIdentity identity) throws KrbException;
@@ -189,7 +196,9 @@ public abstract class AbstractIdentityBackend
/**
* Update an identity, invoked by updateIdentity, and return updated identity.
- * @param identity
+ * @param identity The origin identity
+ * @return The updated identity
+ * @throws KrbException e
*/
protected abstract KrbIdentity doUpdateIdentity(KrbIdentity identity) throws KrbException;
@@ -215,7 +224,8 @@ public abstract class AbstractIdentityBackend
/**
* Delete an identity, invoked by deleteIndentity.
- * @param principalName
+ * @param principalName The principal name
+ * @throws KrbException e
*/
protected abstract void doDeleteIdentity(String principalName) throws KrbException;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4f822df7/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/IdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/IdentityBackend.java b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/IdentityBackend.java
index 3a8126c..2e62e03 100644
--- a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/IdentityBackend.java
+++ b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/IdentityBackend.java
@@ -30,6 +30,7 @@ public interface IdentityBackend extends IdentityService, Configurable {
/**
* Init work for the backend can be done here.
+ * @throws KrbException e
*/
void initialize() throws KrbException;
@@ -45,6 +46,7 @@ public interface IdentityBackend extends IdentityService, Configurable {
* Stop the backend.
*
* Will be called during KDC stop.
+ * @throws KrbException e
*/
void stop() throws KrbException;
[27/46] directory-kerby git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-kerby
Posted by pl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1de9a078
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1de9a078
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1de9a078
Branch: refs/heads/pkinit-support
Commit: 1de9a0783b8c8c02220de91d5625199efe7043fa
Parents: 751475c 205295a
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 14:35:22 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 14:35:22 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/client/ClientUtil.java | 9 ++-
.../kerby/kerberos/kerb/client/KrbClient.java | 67 +++++++++++---------
.../kerby/kerberos/kerb/client/KrbHandler.java | 3 +
.../kerby/kerberos/kerb/client/KrbSetting.java | 4 +-
.../kerb/client/preauth/KrbPreauth.java | 32 +++++++++-
.../kerb/client/request/KdcRequest.java | 8 +++
6 files changed, 86 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[24/46] directory-kerby git commit: add JavaDoc for kdc-tool and
client-tool and TokenJaasKrbUtil.java
Posted by pl...@apache.org.
add JavaDoc for kdc-tool and client-tool and TokenJaasKrbUtil.java
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/19676d9c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/19676d9c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/19676d9c
Branch: refs/heads/pkinit-support
Commit: 19676d9c4314f1c88dd996fe790450d90c00fa85
Parents: bbc8ecf
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 14:14:30 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 14:14:30 2015 +0800
----------------------------------------------------------------------
.../kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java | 2 ++
.../src/main/java/org/apache/kerby/kerberos/tool/ToolUtil.java | 2 +-
.../apache/kerby/kerberos/tool/kadmin/command/KadminCommand.java | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/19676d9c/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java
index b79fef0..42a203d 100644
--- a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java
+++ b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java
@@ -40,6 +40,7 @@ public class TokenJaasKrbUtil {
/**
* Login using token cache.
*
+ * @throws javax.security.auth.login.LoginException
* @param principal The client principal name
* @param tokenCache the token cache for login
* @param armorCache the armor cache for fast preauth
@@ -64,6 +65,7 @@ public class TokenJaasKrbUtil {
/**
* Login using token string.
*
+ * @throws javax.security.auth.login.LoginException
* @param principal The client principal name
* @param tokenStr the token string for login
* @param armorCache the armor cache for fast preauth
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/19676d9c/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/ToolUtil.java
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/ToolUtil.java b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/ToolUtil.java
index c9b5c6e..567662a 100644
--- a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/ToolUtil.java
+++ b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/ToolUtil.java
@@ -30,7 +30,7 @@ public class ToolUtil {
/**
* Convert tool (like kinit) options to KrbOptions.
- * @param krbOptions
+ * @param krbOptions krb options
* @return krb options
*/
public static KOptions convertOptions(KOptions krbOptions) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/19676d9c/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KadminCommand.java
----------------------------------------------------------------------
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KadminCommand.java b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KadminCommand.java
index bcafd79..b93537c 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KadminCommand.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/command/KadminCommand.java
@@ -35,6 +35,7 @@ public abstract class KadminCommand {
/**
* Execute the kadmin command.
+ * @param input Input command to excute
*/
public abstract void execute(String input);
}
[14/46] directory-kerby git commit: Add maven javadoc plugin.
Posted by pl...@apache.org.
Add maven javadoc plugin.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/a2bdc218
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a2bdc218
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a2bdc218
Branch: refs/heads/pkinit-support
Commit: a2bdc218b6d132ad4979ad551b8bc3ac2760c87b
Parents: 81f0c95
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 10:36:46 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 10:36:46 2015 +0800
----------------------------------------------------------------------
pom.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a2bdc218/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a78856d..6528f6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,6 +320,21 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.3</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</pluginManagement>
@@ -352,6 +367,11 @@
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>
[07/46] directory-kerby git commit: Added the SCM tag,
required for the release. Fixed the link to the web site
Posted by pl...@apache.org.
Added the SCM tag, required for the release. Fixed the link to the web site
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/11444a0f
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/11444a0f
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/11444a0f
Branch: refs/heads/pkinit-support
Commit: 11444a0f0b3f71a6904f4abf66fe10e2700048a5
Parents: fb65539
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 12:30:32 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 12:30:32 2015 +0200
----------------------------------------------------------------------
pom.xml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/11444a0f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b99c1db..7e056a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.kerby</groupId>
@@ -21,9 +22,16 @@
<name>Apache Kerby Project</name>
<description>Apache Kerby project</description>
- <url>http://www.kerby.org</url>
+ <url>http://directory.apache.org/kerby</url>
<inceptionYear>2014</inceptionYear>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-kerby.git</connection>
+ <url>https://github.com/apache/directory-kerby</url>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-kerby.git</developerConnection>
+ <tag>HEAD</tag>
+ </scm>
+
<properties>
<apacheds.version>2.0.0-M20</apacheds.version>
<ldap.api.version>1.0.0-M31</ldap.api.version>
[26/46] directory-kerby git commit: add JavaDoc for kerb-simplekdc
module
Posted by pl...@apache.org.
add JavaDoc for kerb-simplekdc module
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/751475c5
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/751475c5
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/751475c5
Branch: refs/heads/pkinit-support
Commit: 751475c55f0351369b6c5a8064e3d42f6385e570
Parents: 947c15c
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 14:34:43 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 14:34:43 2015 +0800
----------------------------------------------------------------------
.../kerberos/kerb/server/SimpleKdcServer.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/751475c5/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
index 9da97ea..3e000bc 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
@@ -41,6 +41,8 @@ public class SimpleKdcServer extends KdcServer {
/**
* Default constructor.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
*/
public SimpleKdcServer() throws KrbException {
super();
@@ -164,6 +166,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Create principal with principal name.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
* @param principal The principal name
*/
public void createPrincipal(String principal) throws KrbException {
@@ -173,6 +176,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Create principal with principal name and password.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
* @param principal The principal name
* @param password The password to create keys
*/
@@ -184,6 +188,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Create principals.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
* @param principals The principal list
*/
public void createPrincipals(String ... principals) throws KrbException {
@@ -195,6 +200,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Creates principals and export their keys to the specified keytab file.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
* @param keytabFile The keytab file to store principal keys
* @param principals The principals to be create
*/
@@ -207,6 +213,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Delete principals.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
* @param principals The principals to be delete
*/
public void deletePrincipals(String ... principals) throws KrbException {
@@ -218,6 +225,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Delete principal.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
* @param principal The principal to be delete
*/
public void deletePrincipal(String principal) throws KrbException {
@@ -235,14 +243,17 @@ public class SimpleKdcServer extends KdcServer {
/**
* Export the keys of the specified principal into keytab file.
- * @param principal
- * @param keytabFile
- * @throws KrbException
+ * @param principal principal
+ * @param keytabFile keytab file
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
*/
public void exportPrincipal(String principal, File keytabFile) throws KrbException {
kadmin.exportKeytab(keytabFile, principal);
}
+ /**
+ * @throws KrbException
+ */
@Override
public void stop() throws KrbException {
super.stop();
[05/46] directory-kerby git commit: removed unusued declaratiuon
Posted by pl...@apache.org.
removed unusued declaratiuon
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/94c55779
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/94c55779
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/94c55779
Branch: refs/heads/pkinit-support
Commit: 94c557794807bda3daec341edac1dbf70a2f3c80
Parents: aee06fa
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 12:01:02 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 12:01:02 2015 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/94c55779/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
index e62727a..26fb3a2 100644
--- a/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
+++ b/kerby-asn1/src/test/java/org/apache/kerby/asn1/TestTaggingEncoding.java
@@ -168,8 +168,6 @@ public class TestTaggingEncoding {
Type1 aType1 = new Type1(TEST_STRING);
Type2 aType2 = new Type2(aType1);
Type3 aType3 = new Type3(aType2);
- Type4 aType4 = new Type4(aType3);
- Type5 aType5 = new Type5(aType2);
assertThat(aType1.encode()).isEqualTo(TYPE1_EXPECTED_BYTES);
assertThat(TYPE2_EXPECTED_BYTES)
[34/46] directory-kerby git commit: add JavaDoc for kerb-server module
Posted by pl...@apache.org.
add JavaDoc for kerb-server module
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/954dd267
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/954dd267
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/954dd267
Branch: refs/heads/pkinit-support
Commit: 954dd2671790f0f004ecac044cd06fc48185f829
Parents: e0dd503
Author: yaningxu <ya...@gmail.com>
Authored: Tue Aug 25 09:06:28 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Tue Aug 25 09:06:28 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/server/KdcHandler.java | 12 +-
.../kerby/kerberos/kerb/server/KdcServer.java | 10 +-
.../kerby/kerberos/kerb/server/KdcSetting.java | 37 +++++-
.../kerby/kerberos/kerb/server/KdcUtil.java | 20 +++-
.../kerb/server/preauth/KdcPreauth.java | 15 +++
.../kerberos/kerb/server/request/AsRequest.java | 1 +
.../kerb/server/request/KdcRequest.java | 113 ++++++++++++++++++-
.../kerb/server/request/TgsRequest.java | 11 ++
8 files changed, 206 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/954dd267/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 fb56038..eb63a13 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
@@ -50,7 +50,7 @@ public class KdcHandler {
/**
* Constructor with kdc context.
*
- * @param kdcContext
+ * @param kdcContext kdc context
*/
public KdcHandler(KdcContext kdcContext) {
this.kdcContext = kdcContext;
@@ -59,8 +59,9 @@ public class KdcHandler {
/**
* Process the client request message.
*
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
* @param receivedMessage The client request message
- * @param isTcp
+ * @param isTcp whether the protocol is tcp
* @param remoteAddress Address from remote side
* @return The response message
*/
@@ -133,7 +134,7 @@ public class KdcHandler {
* Process the recoverable exception.
*
* @param e The exception return by kdc
- * @param kdcRequest
+ * @param kdcRequest kdc request
* @return The KrbError
*/
private KrbMessage handleRecoverableException(KdcRecoverableException e,
@@ -156,6 +157,11 @@ public class KdcHandler {
return error;
}
+ /**
+ * Get request realm.
+ * @param kdcReq kdc request
+ * @return realm
+ */
private String getRequestRealm(KdcReq kdcReq) {
String realm = kdcReq.getReqBody().getRealm();
if (realm == null && kdcReq.getReqBody().getCname() != null) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/954dd267/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 88af20c..3d4f7b9 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
@@ -162,6 +162,7 @@ public class KdcServer {
/**
* Allow to hook customized kdc implementation.
+ *
* @param innerKdcImpl
*/
public void setInnerKdcImpl(InternalKdcServer innerKdcImpl) {
@@ -186,7 +187,8 @@ public class KdcServer {
/**
* Get backend config.
- * @return
+ *
+ * @return backend configuration
*/
public BackendConfig getBackendConfig() {
return backendConfig;
@@ -205,6 +207,8 @@ public class KdcServer {
/**
* Initialize.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
*/
public void init() throws KrbException {
if (startupOptions.contains(KdcServerOption.INNER_KDC_IMPL)) {
@@ -219,6 +223,8 @@ public class KdcServer {
/**
* Start the KDC server.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
*/
public void start() throws KrbException {
if (innerKdc == null) {
@@ -229,6 +235,8 @@ public class KdcServer {
/**
* Stop the KDC server.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
*/
public void stop() throws KrbException {
if (innerKdc != null) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/954dd267/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
index 35685c2..85f4da7 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcSetting.java
@@ -31,6 +31,12 @@ public class KdcSetting {
private final KdcConfig kdcConfig;
private final BackendConfig backendConfig;
+ /**
+ * KdcSetting constructor
+ * @param startupOptions startup options
+ * @param config kdc configuration
+ * @param backendConfig backend configuration
+ */
public KdcSetting(KOptions startupOptions,
KdcConfig config, BackendConfig backendConfig) {
this.startupOptions = startupOptions;
@@ -44,7 +50,7 @@ public class KdcSetting {
/**
* Get the KDC config.
- * @return
+ * @return kdc configuration
*/
public KdcConfig getKdcConfig() {
return kdcConfig;
@@ -52,7 +58,7 @@ public class KdcSetting {
/**
* Get the backend config.
- * @return
+ * @return backend configuration
*/
public BackendConfig getBackendConfig() {
return backendConfig;
@@ -70,7 +76,7 @@ public class KdcSetting {
/**
* Check kdc tcp setting and see if any bad.
* @return valid tcp port or -1 if not allowTcp
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
public int checkGetKdcTcpPort() throws KrbException {
if (allowTcp()) {
@@ -86,7 +92,7 @@ public class KdcSetting {
/**
* Check kdc udp setting and see if any bad.
* @return valid udp port or -1 if not allowUdp
- * @throws KrbException
+ * @throws KrbException e
*/
public int checkGetKdcUdpPort() throws KrbException {
if (allowUdp()) {
@@ -99,6 +105,11 @@ public class KdcSetting {
return -1;
}
+ /**
+ * Get kdc tcp port
+ *
+ * @return kdc tcp port
+ */
public int getKdcTcpPort() {
int tcpPort = startupOptions.getIntegerOption(KdcServerOption.KDC_TCP_PORT);
if (tcpPort < 1) {
@@ -111,6 +122,11 @@ public class KdcSetting {
return tcpPort;
}
+ /**
+ * Get kdc port
+ *
+ * @return kdc port
+ */
public int getKdcPort() {
int kdcPort = startupOptions.getIntegerOption(KdcServerOption.KDC_PORT);
if (kdcPort < 1) {
@@ -119,18 +135,31 @@ public class KdcSetting {
return kdcPort;
}
+ /**
+ * Get whether tcp protocol is allowed
+ * @return tcp protocol is allowed or not
+ */
public boolean allowTcp() {
Boolean allowTcp = startupOptions.getBooleanOption(
KdcServerOption.ALLOW_TCP, kdcConfig.allowTcp());
return allowTcp;
}
+ /**
+ * Get whether udp protocol is allowed
+ * @return udp protocol is allowed or not
+ */
public boolean allowUdp() {
Boolean allowUdp = startupOptions.getBooleanOption(
KdcServerOption.ALLOW_UDP, kdcConfig.allowUdp());
return allowUdp;
}
+ /**
+ * Get kdc udp port
+ *
+ * @return udp port
+ */
public int getKdcUdpPort() {
int udpPort = startupOptions.getIntegerOption(KdcServerOption.KDC_UDP_PORT);
if (udpPort < 1) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/954dd267/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcUtil.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcUtil.java
index c923ef6..1b41a08 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcUtil.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcUtil.java
@@ -36,6 +36,12 @@ public final class KdcUtil {
private KdcUtil() { }
+ /**
+ * Get kdc configuration
+ * @param confDir configuration directory
+ * @return kdc configuration
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
+ */
public static KdcConfig getKdcConfig(File confDir) throws KrbException {
File kdcConfFile = new File(confDir, "kdc.conf");
if (kdcConfFile.exists()) {
@@ -52,6 +58,12 @@ public final class KdcUtil {
return null;
}
+ /**
+ * Get backend configuration
+ * @param confDir configuration directory
+ * @return backend configuration
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
+ */
public static BackendConfig getBackendConfig(File confDir) throws KrbException {
File backendConfigFile = new File(confDir, "backend.conf");
if (backendConfigFile.exists()) {
@@ -70,6 +82,10 @@ public final class KdcUtil {
/**
* Init the identity backend from backend configuration.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
+ * @param backendConfig backend configuration information
+ * @return backend
*/
public static IdentityBackend getBackend(
BackendConfig backendConfig) throws KrbException {
@@ -102,9 +118,9 @@ public final class KdcUtil {
/**
* Get KDC network transport addresses according to KDC setting.
- * @param setting
+ * @param setting kdc setting
* @return UDP and TCP addresses pair
- * @throws KrbException
+ * @throws KrbException e
*/
public static TransportPair getTransportPair(
KdcSetting setting) throws KrbException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/954dd267/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java
index 7c43277..de862b3 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/KdcPreauth.java
@@ -36,17 +36,23 @@ public interface KdcPreauth extends PreauthPluginMeta {
/**
* Initializing plugin context for each realm
+ * @param context kdc context
*/
void initWith(KdcContext context);
/**
* Initializing request context
+ * @param kdcRequest kdc context
*/
PluginRequestContext initRequestContext(KdcRequest kdcRequest);
/**
* Optional: provide pa_data to send to the client as part of the "you need to
* use preauthentication" error.
+ *
+ * @param kdcRequest kdc request
+ * @param requestContext request context
+ * @param outPaData out preauthentication data
*/
void provideEdata(KdcRequest kdcRequest, PluginRequestContext requestContext,
PaData outPaData) throws KrbException;
@@ -55,6 +61,9 @@ public interface KdcPreauth extends PreauthPluginMeta {
* Optional: verify preauthentication data sent by the client, setting the
* TKT_FLG_PRE_AUTH or TKT_FLG_HW_AUTH flag in the enc_tkt_reply's "flags"
* field as appropriate.
+ * @param kdcRequest kdc request
+ * @param requestContext request context
+ * @param paData preauthentication data
*/
boolean verify(KdcRequest kdcRequest, PluginRequestContext requestContext,
PaDataEntry paData) throws KrbException;
@@ -62,6 +71,9 @@ public interface KdcPreauth extends PreauthPluginMeta {
/**
* Optional: generate preauthentication response data to send to the client as
* part of the AS-REP.
+ * @param kdcRequest kdc request
+ * @param requestContext request context
+ * @param paData preauthentication data
*/
void providePaData(KdcRequest kdcRequest, PluginRequestContext requestContext,
PaData paData);
@@ -69,6 +81,9 @@ public interface KdcPreauth extends PreauthPluginMeta {
/**
* Return PA_REAL if pa_type is a real preauthentication type or PA_INFO if it is
* an informational type.
+ * @param kdcRequest kdc request
+ * @param requestContext request context
+ * @param paType preauthentication type
*/
PaFlags getFlags(KdcRequest kdcRequest, PluginRequestContext requestContext,
PaDataType paType);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/954dd267/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/AsRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/AsRequest.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/AsRequest.java
index 367c8c2..688fed5 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/AsRequest.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/AsRequest.java
@@ -134,6 +134,7 @@ public class AsRequest extends KdcRequest {
/**
* Make EncKdcRepPart.
+ * @return encryption kdc request part
*/
protected EncKdcRepPart makeEncKdcRepPart() {
KdcReq request = getKdcReq();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/954dd267/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
index 059eee0..191fdfa 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/KdcRequest.java
@@ -96,6 +96,8 @@ public abstract class KdcRequest {
/**
* Get session key.
+ *
+ * @return session key
*/
public EncryptionKey getSessionKey() {
return sessionKey;
@@ -108,6 +110,11 @@ public abstract class KdcRequest {
this.sessionKey = sessionKey;
}
+ /**
+ * kdc request constructor
+ * @param kdcReq kdc request
+ * @param kdcContext kdc context
+ */
public KdcRequest(KdcReq kdcReq, KdcContext kdcContext) {
this.kdcReq = kdcReq;
this.kdcContext = kdcContext;
@@ -119,6 +126,8 @@ public abstract class KdcRequest {
/**
* Get kdc context.
+ *
+ * @return kdc context
*/
public KdcContext getKdcContext() {
return kdcContext;
@@ -126,6 +135,8 @@ public abstract class KdcRequest {
/**
* Get KdcReq.
+ *
+ * @return kdc request
*/
public KdcReq getKdcReq() {
return kdcReq;
@@ -133,6 +144,8 @@ public abstract class KdcRequest {
/**
* Get preauth context.
+ *
+ * @return preauthentication context.
*/
public PreauthContext getPreauthContext() {
return preauthContext;
@@ -140,6 +153,8 @@ public abstract class KdcRequest {
/**
* Process the kdcrequest from client and issue the ticket.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
*/
public void process() throws KrbException {
checkVersion();
@@ -162,6 +177,8 @@ public abstract class KdcRequest {
/**
* Check the tgs entry.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e.
*/
private void checkTgsEntry() throws KrbException {
KrbIdentity tgsEntry = getEntry(getTgsPrincipal().getName());
@@ -170,6 +187,8 @@ public abstract class KdcRequest {
/**
* Find the fast from padata.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
private void kdcFindFast() throws KrbException {
@@ -202,6 +221,9 @@ public abstract class KdcRequest {
/**
* Get the armor key.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
+ * @param fastArmor krb fast armor
*/
private void armorApRequest(KrbFastArmor fastArmor) throws KrbException {
if (fastArmor.getArmorType() == ArmorType.ARMOR_AP_REQUEST) {
@@ -232,6 +254,8 @@ public abstract class KdcRequest {
/**
* Get tgs entry.
+ *
+ * @return TGS entry
*/
public KrbIdentity getTgsEntry() {
return tgsEntry;
@@ -239,6 +263,8 @@ public abstract class KdcRequest {
/**
* Set tgs entry .
+ *
+ * @param tgsEntry TGS entry
*/
public void setTgsEntry(KrbIdentity tgsEntry) {
this.tgsEntry = tgsEntry;
@@ -246,6 +272,8 @@ public abstract class KdcRequest {
/**
* Get whether is tcp.
+ *
+ * @return whether is tcp
*/
public boolean isTcp() {
return isTcp;
@@ -253,6 +281,8 @@ public abstract class KdcRequest {
/**
* Set use tcp.
+ *
+ * @param isTcp set kdc request though TCP protocol or not
*/
public void isTcp(boolean isTcp) {
this.isTcp = isTcp;
@@ -260,6 +290,8 @@ public abstract class KdcRequest {
/**
* Get the reply message.
+ *
+ * @return reply
*/
public KrbMessage getReply() {
return reply;
@@ -267,6 +299,8 @@ public abstract class KdcRequest {
/**
* Set kdc reply.
+ *
+ * @param reply reply
*/
public void setReply(KdcRep reply) {
this.reply = reply;
@@ -274,6 +308,8 @@ public abstract class KdcRequest {
/**
* Get client address.
+ *
+ * @return client address
*/
public InetAddress getClientAddress() {
return clientAddress;
@@ -281,6 +317,8 @@ public abstract class KdcRequest {
/**
* Set client address.
+ *
+ * @param clientAddress client address
*/
public void setClientAddress(InetAddress clientAddress) {
this.clientAddress = clientAddress;
@@ -288,6 +326,8 @@ public abstract class KdcRequest {
/**
* Get encryption type.
+ *
+ * @return encryption type
*/
public EncryptionType getEncryptionType() {
return encryptionType;
@@ -295,6 +335,8 @@ public abstract class KdcRequest {
/**
* Set encryption type.
+ *
+ * @param encryptionType encryption type
*/
public void setEncryptionType(EncryptionType encryptionType) {
this.encryptionType = encryptionType;
@@ -302,6 +344,8 @@ public abstract class KdcRequest {
/**
* Get ticket.
+ *
+ * @return ticket
*/
public Ticket getTicket() {
return ticket;
@@ -309,6 +353,8 @@ public abstract class KdcRequest {
/**
* Set ticket.
+ *
+ * @param ticket ticket
*/
public void setTicket(Ticket ticket) {
this.ticket = ticket;
@@ -316,6 +362,8 @@ public abstract class KdcRequest {
/**
* Get whether pre-authenticated.
+ *
+ * @return whether preauthenticated
*/
public boolean isPreAuthenticated() {
return isPreAuthenticated;
@@ -323,6 +371,8 @@ public abstract class KdcRequest {
/**
* Set whether pre-authenticated.
+ *
+ * @param isPreAuthenticated whether is preauthenticated
*/
public void setPreAuthenticated(boolean isPreAuthenticated) {
this.isPreAuthenticated = isPreAuthenticated;
@@ -330,6 +380,8 @@ public abstract class KdcRequest {
/**
* Get server entry.
+ *
+ * @return server entry
*/
public KrbIdentity getServerEntry() {
return serverEntry;
@@ -337,6 +389,8 @@ public abstract class KdcRequest {
/**
* Set server entry.
+ *
+ * @param serverEntry server entry
*/
public void setServerEntry(KrbIdentity serverEntry) {
this.serverEntry = serverEntry;
@@ -344,6 +398,8 @@ public abstract class KdcRequest {
/**
* Get client entry.
+ *
+ * @return client entry
*/
public KrbIdentity getClientEntry() {
return clientEntry;
@@ -351,6 +407,8 @@ public abstract class KdcRequest {
/**
* Set client entry.
+ *
+ * @param clientEntry client entry
*/
public void setClientEntry(KrbIdentity clientEntry) {
this.clientEntry = clientEntry;
@@ -358,6 +416,10 @@ public abstract class KdcRequest {
/**
* Get client key with entryption type.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
+ * @param encType encryption type
+ * @return encryption key
*/
public EncryptionKey getClientKey(EncryptionType encType) throws KrbException {
return getClientEntry().getKey(encType);
@@ -365,6 +427,8 @@ public abstract class KdcRequest {
/**
* Get client key.
+ *
+ * @return client key
*/
public EncryptionKey getClientKey() {
return clientKey;
@@ -372,6 +436,8 @@ public abstract class KdcRequest {
/**
* Set client key.
+ *
+ * @param clientKey client key
*/
public void setClientKey(EncryptionKey clientKey) {
this.clientKey = clientKey;
@@ -386,6 +452,8 @@ public abstract class KdcRequest {
/**
* Set server key.
+ *
+ * @param serverKey server key
*/
public void setServerKey(EncryptionKey serverKey) {
this.serverKey = serverKey;
@@ -393,6 +461,8 @@ public abstract class KdcRequest {
/**
* Get tgs principal name.
+ *
+ * @return principal name
*/
public PrincipalName getTgsPrincipal() {
PrincipalName result = KrbUtil.makeTgsPrincipal(kdcContext.getKdcRealm());
@@ -401,11 +471,15 @@ public abstract class KdcRequest {
/**
* Make reply.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
protected abstract void makeReply() throws KrbException;
/**
* Check Version.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
protected void checkVersion() throws KrbException {
KdcReq request = getKdcReq();
@@ -420,6 +494,8 @@ public abstract class KdcRequest {
/**
* Check policy.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
protected void checkPolicy() throws KrbException {
KrbIdentity entry = getClientEntry();
@@ -444,11 +520,14 @@ public abstract class KdcRequest {
/**
* Check client.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
protected abstract void checkClient() throws KrbException;
/**
* Do the preatuh.
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
protected void preauth() throws KrbException {
KdcReq request = getKdcReq();
@@ -471,6 +550,7 @@ public abstract class KdcRequest {
/**
* Set whether preauth required.
+ * @param preauthRequired whether preauthentication required
*/
protected void setPreauthRequired(boolean preauthRequired) {
preauthContext.setPreauthRequired(preauthRequired);
@@ -478,6 +558,7 @@ public abstract class KdcRequest {
/**
* Get whether preauth required.
+ * @return whether preauthentication is required
*/
protected boolean isPreauthRequired() {
return preauthContext.isPreauthRequired();
@@ -485,6 +566,7 @@ public abstract class KdcRequest {
/**
* Get preauth handler.
+ * @return preauthencation handler
*/
protected PreauthHandler getPreauthHandler() {
return kdcContext.getPreauthHandler();
@@ -492,6 +574,8 @@ public abstract class KdcRequest {
/**
* Check encryption type.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
protected void checkEncryptionType() throws KrbException {
List<EncryptionType> requestedTypes = getKdcReq().getReqBody().getEtypes();
@@ -509,6 +593,8 @@ public abstract class KdcRequest {
/**
* Do some authenticate.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
protected void authenticate() throws KrbException {
checkEncryptionType();
@@ -517,11 +603,14 @@ public abstract class KdcRequest {
/**
* Issue ticket.
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
protected abstract void issueTicket() throws KrbException;
/**
* Check server.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
private void checkServer() throws KrbException {
KdcReq request = getKdcReq();
@@ -548,9 +637,10 @@ public abstract class KdcRequest {
/**
* Make preauthentication error.
*
- * @param kdcContext
- * @param request
- * @param errorCode
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
+ * @param kdcContext kdc context
+ * @param request kdc request
+ * @param errorCode krb error code
* @return The krb error reply to client
*/
protected KrbError makePreAuthenticationError(KdcContext kdcContext, KdcReq request,
@@ -603,6 +693,10 @@ public abstract class KdcRequest {
/**
* Get identity entry with principal name.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @param principal Principal
+ * @return krb identity entry
*/
protected KrbIdentity getEntry(String principal) throws KrbException {
KrbIdentity entry;
@@ -617,6 +711,9 @@ public abstract class KdcRequest {
/**
* Get request body.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
+ * @return request body
*/
protected ByteBuffer getRequestBody() throws KrbException {
return null;
@@ -624,6 +721,9 @@ public abstract class KdcRequest {
/**
* Get armor key.
+ *
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
+ * @return armor key
*/
public EncryptionKey getArmorKey() throws KrbException {
return fastContext.getArmorKey();
@@ -631,6 +731,8 @@ public abstract class KdcRequest {
/**
* Set armor key.
+ *
+ * @param armorKey armor key
*/
protected void setArmorKey(EncryptionKey armorKey) {
fastContext.setArmorKey(armorKey);
@@ -638,6 +740,7 @@ public abstract class KdcRequest {
/**
* Get server principal.
+ * @return server principal
*/
public PrincipalName getServerPrincipal() {
return serverPrincipal;
@@ -645,6 +748,7 @@ public abstract class KdcRequest {
/**
* Set server principal.
+ * @param serverPrincipal server principal
*/
public void setServerPrincipal(PrincipalName serverPrincipal) {
this.serverPrincipal = serverPrincipal;
@@ -652,6 +756,7 @@ public abstract class KdcRequest {
/**
* Get innerbodyout.
+ * @return inner body out
*/
protected byte[] getInnerBodyout() {
return innerBodyout;
@@ -659,6 +764,7 @@ public abstract class KdcRequest {
/**
* Get whether kdc request with token.
+ * @return whether isToken
*/
protected boolean isToken() {
return isToken;
@@ -673,6 +779,7 @@ public abstract class KdcRequest {
/**
* Get auth token.
+ * @return token
*/
protected AuthToken getToken() {
return token;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/954dd267/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java
index d654550..4d6d50c 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TgsRequest.java
@@ -57,6 +57,10 @@ public class TgsRequest extends KdcRequest {
private EncryptionKey tgtSessionKey;
private Ticket tgtTicket;
+ /**
+ * @param tgsReq TGS request
+ * @param kdcContext kdc context
+ */
public TgsRequest(TgsReq tgsReq, KdcContext kdcContext) {
super(tgsReq, kdcContext);
@@ -110,6 +114,8 @@ public class TgsRequest extends KdcRequest {
/**
* Verify authenticator.
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
+ * @param paDataEntry preauthentication data entry
*/
public void verifyAuthenticator(PaDataEntry paDataEntry) throws KrbException {
ApReq apReq = KrbCodec.decode(paDataEntry.getPaDataValue(), ApReq.class);
@@ -222,6 +228,7 @@ public class TgsRequest extends KdcRequest {
/**
* Make EncKdcRepPart.
+ * @return encryption kdc response part
*/
private EncKdcRepPart makeEncKdcRepPart() {
KdcReq request = getKdcReq();
@@ -257,6 +264,10 @@ public class TgsRequest extends KdcRequest {
return encKdcRepPart;
}
+ /**
+ * @return request body
+ * @throws KrbException e
+ */
public ByteBuffer getRequestBody() throws KrbException {
return null;
}
[44/46] directory-kerby git commit: Minor fixup for scripts for *nix
Posted by pl...@apache.org.
Minor fixup for scripts for *nix
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4cc13b91
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4cc13b91
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4cc13b91
Branch: refs/heads/pkinit-support
Commit: 4cc13b91535a393fdf4ef60098a8204a66f3d84c
Parents: b571be3
Author: drankye <ka...@intel.com>
Authored: Mon Sep 7 16:30:57 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Mon Sep 7 16:30:57 2015 +0800
----------------------------------------------------------------------
kerby-dist/kdc-dist/bin/kadmin.sh | 7 +++----
kerby-dist/kdc-dist/bin/kdcinit.sh | 7 +++----
kerby-dist/kdc-dist/bin/start-kdc.sh | 7 +++----
kerby-dist/tool-dist/bin/kinit.sh | 7 +++----
kerby-dist/tool-dist/bin/klist.sh | 7 +++----
5 files changed, 15 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4cc13b91/kerby-dist/kdc-dist/bin/kadmin.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/bin/kadmin.sh b/kerby-dist/kdc-dist/bin/kadmin.sh
index 7c22f82..3a6b802 100644
--- a/kerby-dist/kdc-dist/bin/kadmin.sh
+++ b/kerby-dist/kdc-dist/bin/kadmin.sh
@@ -1,4 +1,5 @@
-#
+#!/usr/bin/env bash
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -14,13 +15,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-#!/bin/bash
DEBUG=
args=
for var in $*; do
- if [ $var == "-D" ]; then
+ if [ X"$var" == X"-D" ]; then
DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y"
else
args="$args $var"
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4cc13b91/kerby-dist/kdc-dist/bin/kdcinit.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/bin/kdcinit.sh b/kerby-dist/kdc-dist/bin/kdcinit.sh
index 8681112..0dca1b8 100644
--- a/kerby-dist/kdc-dist/bin/kdcinit.sh
+++ b/kerby-dist/kdc-dist/bin/kdcinit.sh
@@ -1,4 +1,5 @@
-#
+#!/usr/bin/env bash
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -14,13 +15,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-#!/bin/bash
DEBUG=
args=
for var in $*; do
- if [ $var == "-D" ]; then
+ if [ X"$var" == X"-D" ]; then
DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8005,server=y,suspend=y"
else
args="$args $var"
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4cc13b91/kerby-dist/kdc-dist/bin/start-kdc.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/bin/start-kdc.sh b/kerby-dist/kdc-dist/bin/start-kdc.sh
index efb898f..5d85aae 100644
--- a/kerby-dist/kdc-dist/bin/start-kdc.sh
+++ b/kerby-dist/kdc-dist/bin/start-kdc.sh
@@ -1,4 +1,5 @@
-#
+#!/usr/bin/env bash
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -14,13 +15,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-#!/bin/bash
DEBUG=
args=
for var in $*; do
- if [ $var == "-D" ]; then
+ if [ X"$var" == X"-D" ]; then
DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
else
args="$args $var"
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4cc13b91/kerby-dist/tool-dist/bin/kinit.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/bin/kinit.sh b/kerby-dist/tool-dist/bin/kinit.sh
index 8ad3f31..427a5c9 100644
--- a/kerby-dist/tool-dist/bin/kinit.sh
+++ b/kerby-dist/tool-dist/bin/kinit.sh
@@ -1,4 +1,5 @@
-#
+#!/usr/bin/env bash
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -14,13 +15,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-#!/bin/bash
DEBUG=
args=
for var in $*; do
- if [ $var == "-D" ]; then
+ if [ X"$var" == X"-D" ]; then
DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8002,server=y,suspend=y"
else
args="$args $var"
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4cc13b91/kerby-dist/tool-dist/bin/klist.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/bin/klist.sh b/kerby-dist/tool-dist/bin/klist.sh
index a81de88..4bd0a99 100644
--- a/kerby-dist/tool-dist/bin/klist.sh
+++ b/kerby-dist/tool-dist/bin/klist.sh
@@ -1,4 +1,5 @@
-#
+#!/usr/bin/env bash
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -14,13 +15,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-#!/bin/bash
DEBUG=
args=
for var in $*; do
- if [ $var == "-D" ]; then
+ if [ X"$var" == X"-D" ]; then
DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8004,server=y,suspend=y"
else
args="$args $var"
[19/46] directory-kerby git commit: Fix javadoc of kerb-common module.
Posted by pl...@apache.org.
Fix javadoc of kerb-common module.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/9013961d
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/9013961d
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/9013961d
Branch: refs/heads/pkinit-support
Commit: 9013961df3ab628380290d92275feed74e58e6be
Parents: 024d572
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 13:46:30 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 13:46:30 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kerby/kerberos/kerb/common/KrbUtil.java | 4 ++--
.../kerby/kerberos/kerb/transport/KdcUdpTransport.java | 2 +-
.../kerby/kerberos/kerb/transport/KrbTcpTransport.java | 2 +-
.../apache/kerby/kerberos/kerb/transport/KrbTransport.java | 9 +++++----
.../kerby/kerberos/kerb/transport/KrbUdpTransport.java | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9013961d/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 fba622d..0610807 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
@@ -27,7 +27,7 @@ public class KrbUtil {
/**
* Construct TGS principal name.
- * @param realm
+ * @param realm The realm
* @return principal
*/
public static PrincipalName makeTgsPrincipal(String realm) {
@@ -37,7 +37,7 @@ public class KrbUtil {
/**
* Construct kadmin principal name.
- * @param realm
+ * @param realm The realm
* @return principal
*/
public static PrincipalName makeKadminPrincipal(String realm) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9013961d/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcUdpTransport.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcUdpTransport.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcUdpTransport.java
index f2e67cd..34d38d3 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcUdpTransport.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KdcUdpTransport.java
@@ -28,7 +28,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
/**
- * Default implementation of {@Link KrbTransport} using UDP.
+ * Default implementation of {@link KrbTransport} using UDP.
*/
public class KdcUdpTransport extends KrbUdpTransport {
private BlockingQueue<ByteBuffer> bufferQueue = new ArrayBlockingQueue<ByteBuffer>(2);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9013961d/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTcpTransport.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTcpTransport.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTcpTransport.java
index 6b7cdee..4a51611 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTcpTransport.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTcpTransport.java
@@ -27,7 +27,7 @@ import java.net.Socket;
import java.nio.ByteBuffer;
/**
- * Default implementation of {@Link KrbTransport} using TCP in block mode.
+ * Default implementation of {@link KrbTransport} using TCP in block mode.
*/
public class KrbTcpTransport
extends AbstractKrbTransport implements KrbTransport {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9013961d/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java
index 3c54c27..3ee54a6 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java
@@ -30,19 +30,20 @@ public interface KrbTransport {
/**
* Send out a Kerberos message to remote peer.
- * @param message
+ * @param message The message to be sent
*/
void sendMessage(ByteBuffer message) throws IOException;
/**
* Receive a Kerberos message from remote.
- * @return
+ * @return The received message
+ * @throws IOException e
*/
ByteBuffer receiveMessage() throws IOException;
/**
* Judge the type of transport, return true if it is tcp,
- * reture false if it is udp.
+ * @return false if it is udp.
*/
boolean isTcp();
@@ -55,7 +56,7 @@ public interface KrbTransport {
/**
* Set an attachment.
- * @param attachment
+ * @param attachment The attachment
*/
void setAttachment(Object attachment);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9013961d/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbUdpTransport.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbUdpTransport.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbUdpTransport.java
index 906bdc7..72a3c2b 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbUdpTransport.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbUdpTransport.java
@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.DatagramChannel;
/**
- * Default implementation of {@Link KrbTransport} using UDP.
+ * Default implementation of {@link KrbTransport} using UDP.
*/
public class KrbUdpTransport
extends AbstractKrbTransport implements KrbTransport {
[06/46] directory-kerby git commit: Added the bin directory into the
ignored git files list
Posted by pl...@apache.org.
Added the bin directory into the ignored git files list
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/fb655398
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/fb655398
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/fb655398
Branch: refs/heads/pkinit-support
Commit: fb6553984da6d8d762bcf6aeca3b7edca2036091
Parents: 94c5577
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 12:03:41 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 12:03:41 2015 +0200
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fb655398/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ff05a87..1fd8666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ dependency-reduced-pom.xml
.pmdruleset.xml
.pmd
.checkstyle
+bin/
kerby-dist/kdc-dist/lib/
kerby-dist/tool-dist/lib/
kerby-dist/kdc-dist/logs/
[17/46] directory-kerby git commit: Fix javadoc errors of kerb-crypto
module.
Posted by pl...@apache.org.
Fix javadoc errors of kerb-crypto module.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/ec0f46b1
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/ec0f46b1
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/ec0f46b1
Branch: refs/heads/pkinit-support
Commit: ec0f46b1b8603b80543aff359ac09dd524f18235
Parents: 4a60163
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 13:35:30 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 13:35:30 2015 +0800
----------------------------------------------------------------------
.../kerberos/kerb/crypto/EncryptionHandler.java | 115 ++++++++++++++++++-
.../kerberos/kerb/crypto/fast/FastUtil.java | 18 ++-
.../kerb/crypto/key/AbstractKeyMaker.java | 5 +-
.../kerberos/kerb/crypto/key/DesKeyMaker.java | 9 +-
.../kerberos/kerb/crypto/random/JavaRandom.java | 3 +-
.../kerb/crypto/random/RandomProvider.java | 4 +-
.../kerberos/kerb/crypto/util/Camellia.java | 8 ++
.../kerby/kerberos/kerb/crypto/util/Des.java | 3 +
.../kerby/kerberos/kerb/crypto/util/Nfold.java | 5 +-
9 files changed, 151 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java
index bf6408f..7c811ef 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/EncryptionHandler.java
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.kerby.kerberos.kerb.crypto;
@@ -52,34 +52,72 @@ public class EncryptionHandler {
static {
try {
isAES256Enabled = Cipher.getMaxAllowedKeyLength("AES") >= 256;
- } catch (Exception e) { //NOPMD
+ } catch (Exception e) {
System.err.println(e);
}
}
+ /**
+ * @return true if aes256 is enabled
+ */
public static boolean isAES256Enabled() {
return isAES256Enabled;
}
+ /**
+ * Get the encryption type.
+ * @param eType The encryption type string.
+ * @return The EncryptionType
+ * @throws KrbException e
+ */
public static EncryptionType getEncryptionType(String eType) throws KrbException {
EncryptionType result = EncryptionType.fromName(eType);
return result;
}
+ /**
+ * Get the encryption handler.
+ *
+ * @param eType The encryption type string
+ * @return The EncTypeHandler
+ * @throws KrbException e
+ */
public static EncTypeHandler getEncHandler(String eType) throws KrbException {
EncryptionType result = EncryptionType.fromName(eType);
return getEncHandler(result);
}
+ /**
+ * Get the encryption handler.
+ *
+ * @param eType The encryption type int
+ * @return The EncTypeHandler
+ * @throws KrbException e
+ */
public static EncTypeHandler getEncHandler(int eType) throws KrbException {
EncryptionType eTypeEnum = EncryptionType.fromValue(eType);
return getEncHandler(eTypeEnum);
}
+ /**
+ * Get the encryption handler.
+ *
+ * @param eType The encryption type
+ * @return The EncTypeHandler
+ * @throws KrbException e
+ */
public static EncTypeHandler getEncHandler(EncryptionType eType) throws KrbException {
return getEncHandler(eType, false);
}
+ /**
+ * Get the encryption handler.
+ *
+ * @param eType The encryption type
+ * @param check true if check
+ * @return The EncTypeHandler
+ * @throws KrbException e
+ */
private static EncTypeHandler getEncHandler(EncryptionType eType,
boolean check) throws KrbException {
EncTypeHandler encHandler = null;
@@ -149,6 +187,15 @@ public class EncryptionHandler {
return encHandler;
}
+ /**
+ * Encrypt with the encryption key and key usage.
+ *
+ * @param plainText The plain test
+ * @param key The encryption key
+ * @param usage The key usage
+ * @return The encrypted data
+ * @throws KrbException e
+ */
public static EncryptedData encrypt(byte[] plainText, EncryptionKey key,
KeyUsage usage) throws KrbException {
EncTypeHandler handler = getEncHandler(key.getKeyType());
@@ -162,6 +209,15 @@ public class EncryptionHandler {
return ed;
}
+ /**
+ * Decrypt with the encryption key and key usage.
+ *
+ * @param data The encrypted data
+ * @param key The encryption key
+ * @param usage The key usage
+ * @return The decrypted data
+ * @throws KrbException e
+ */
public static byte[] decrypt(byte[] data, EncryptionKey key,
KeyUsage usage) throws KrbException {
EncTypeHandler handler = getEncHandler(key.getKeyType());
@@ -170,6 +226,15 @@ public class EncryptionHandler {
return plainData;
}
+ /**
+ * Decrypt with the encryption key and key usage.
+ *
+ * @param data The encrypted data
+ * @param key The encryption key
+ * @param usage The key usage
+ * @return The decrypted data
+ * @throws KrbException e
+ */
public static byte[] decrypt(EncryptedData data, EncryptionKey key,
KeyUsage usage) throws KrbException {
EncTypeHandler handler = getEncHandler(key.getKeyType());
@@ -179,6 +244,12 @@ public class EncryptionHandler {
return plainData;
}
+ /**
+ * Return true if the the encryption handler is implemented.
+ *
+ * @param eType The encryption type
+ * @return true if the encryption handler is implemented
+ */
public static boolean isImplemented(EncryptionType eType) {
EncTypeHandler handler = null;
try {
@@ -189,6 +260,15 @@ public class EncryptionHandler {
return handler != null;
}
+ /**
+ * String to key.
+ *
+ * @param principalName The principal name
+ * @param passPhrase The pass phrase
+ * @param eType The encryption type
+ * @return The encryption key
+ * @throws KrbException e
+ */
public static EncryptionKey string2Key(String principalName,
String passPhrase, EncryptionType eType) throws KrbException {
PrincipalName principal = new PrincipalName(principalName);
@@ -196,6 +276,16 @@ public class EncryptionHandler {
PrincipalName.makeSalt(principal), null, eType);
}
+ /**
+ * String to key.
+ *
+ * @param string The string
+ * @param salt The salt
+ * @param s2kparams The params
+ * @param eType The encryption type
+ * @return The encryption key
+ * @throws KrbException e
+ */
public static EncryptionKey string2Key(String string, String salt,
byte[] s2kparams, EncryptionType eType) throws KrbException {
EncTypeHandler handler = getEncHandler(eType);
@@ -203,6 +293,13 @@ public class EncryptionHandler {
return new EncryptionKey(eType, keyBytes);
}
+ /**
+ * Random to key.
+ *
+ * @param eType The encryption type
+ * @return The encryption key
+ * @throws KrbException e
+ */
public static EncryptionKey random2Key(EncryptionType eType) throws KrbException {
EncTypeHandler handler = getEncHandler(eType);
@@ -212,6 +309,14 @@ public class EncryptionHandler {
return encKey;
}
+ /**
+ * Random to key.
+ *
+ * @param eType The encryption type
+ * @param randomBytes The random bytes
+ * @return The encryption key
+ * @throws KrbException e
+ */
public static EncryptionKey random2Key(EncryptionType eType, byte[] randomBytes) throws KrbException {
EncTypeHandler handler = getEncHandler(eType);
@@ -223,7 +328,7 @@ public class EncryptionHandler {
/**
* Generate a secure and random key seeded with an existing encryption key.
- * @param encKey
+ * @param encKey The encryption key
* @return encryption key
*/
public static EncryptionKey makeSubkey(EncryptionKey encKey) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/fast/FastUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/fast/FastUtil.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/fast/FastUtil.java
index 8d1ee31..4644791 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/fast/FastUtil.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/fast/FastUtil.java
@@ -34,9 +34,13 @@ public class FastUtil {
/**
* Call the PRF function multiple times with the pepper prefixed with
- * a count byte to get enough bits of output.
+ * a count byte to get enough bits of output.
+ * @param key The encryption key
+ * @param pepper The pepper
+ * @param keyBytesLen The key bytes length
+ * @return The output byte
+ * @throws KrbException e
*/
-
public static byte[] prfPlus(EncryptionKey key, String pepper,
int keyBytesLen) throws KrbException {
byte[] prfInbuf = new byte[pepper.length() + 1];
@@ -72,9 +76,10 @@ public class FastUtil {
/**
* Make an encryption key for replying.
- * @param strengthenKey
- * @param existingKey
+ * @param strengthenKey The strengthen key
+ * @param existingKey The existing key
* @return encryption key
+ * @throws KrbException e
*/
public static EncryptionKey makeReplyKey(EncryptionKey strengthenKey,
EncryptionKey existingKey) throws KrbException {
@@ -83,9 +88,10 @@ public class FastUtil {
/**
* Make an encryption key for armoring.
- * @param subkey
- * @param ticketKey
+ * @param subkey The sub key
+ * @param ticketKey The ticket key
* @return encryption key
+ * @throws KrbException e
*/
public static EncryptionKey makeArmorKey(EncryptionKey subkey,
EncryptionKey ticketKey) throws KrbException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/AbstractKeyMaker.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/AbstractKeyMaker.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/AbstractKeyMaker.java
index f57f21b..fe0275e 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/AbstractKeyMaker.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/AbstractKeyMaker.java
@@ -37,7 +37,10 @@ public abstract class AbstractKeyMaker implements KeyMaker {
}
/**
- * Visible for test
+ * Visible for test.
+ * @param password The password
+ * @param salt The salt
+ * @return The password salt
*/
public static byte[] makePasswdSalt(String password, String salt) {
char[] chars = new char[password.length() + salt.length()];
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/DesKeyMaker.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/DesKeyMaker.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/DesKeyMaker.java
index b71cf69..c3c87c9 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/DesKeyMaker.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/key/DesKeyMaker.java
@@ -90,6 +90,7 @@ public class DesKeyMaker extends AbstractKeyMaker {
/**
* Visible for test
+ * {@inheritDoc}
*/
public static byte[] fanFold(String string, String salt, byte[] paddedBytes) {
if (paddedBytes == null) {
@@ -117,6 +118,7 @@ public class DesKeyMaker extends AbstractKeyMaker {
/**
* Visible for test
+ * {@inheritDoc}
*/
public static byte[] intermediateKey(byte[] fanFoldedKey) {
byte[] keyBytes = addParityBits(fanFoldedKey);
@@ -140,10 +142,10 @@ public class DesKeyMaker extends AbstractKeyMaker {
}
/**
- * To turn a 54-bit block into a 64-bit block, see
+ * To turn a 56-bit block into a 64-bit block, see
* Ref. eighth_byte in random_to_key.c in MIT krb5
- * @param bits56
- * @return
+ * @param bits56 The 56-bit block
+ * @return The 64-bit block
*/
private static byte[] getEightBits(byte[] bits56) {
byte[] bits64 = new byte[8];
@@ -156,6 +158,7 @@ public class DesKeyMaker extends AbstractKeyMaker {
/**
* Note this isn't hit any test yet, and very probably problematic
+ * {@inheritDoc}
*/
@Override
public byte[] random2Key(byte[] randomBits) throws KrbException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/JavaRandom.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/JavaRandom.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/JavaRandom.java
index bc20330..91df072 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/JavaRandom.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/JavaRandom.java
@@ -22,7 +22,8 @@ package org.apache.kerby.kerberos.kerb.crypto.random;
import java.security.SecureRandom;
/**
- * Use jdk SecureRandom to implement RandomProvider, so it can be used on windows & linux.
+ * Use jdk {@link SecureRandom} to implement {@link RandomProvider},
+ * so it can be used on windows and linux.
*/
public class JavaRandom implements RandomProvider {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/RandomProvider.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/RandomProvider.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/RandomProvider.java
index 7d6b831..0320443 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/RandomProvider.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/random/RandomProvider.java
@@ -31,13 +31,13 @@ public interface RandomProvider {
void init();
/**
* Provide entropy seed for the provider.
- * @param seed
+ * @param seed The seed
*/
void setSeed(byte[] seed);
/**
* Generate random bytes into the specified array.
- * @param bytes
+ * @param bytes The bytes
*/
void nextBytes(byte[] bytes);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Camellia.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Camellia.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Camellia.java
index e2b2950..2690bb2 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Camellia.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Camellia.java
@@ -211,6 +211,10 @@ public class Camellia {
/**
* CBC encrypt nblocks blocks of data in place, using and updating iv.
+ * @param data The data
+ * @param offset The offset
+ * @param blocksNum The block number
+ * @param cipherState The cipher state
*/
public void cbcEnc(byte[] data, int offset, int blocksNum, byte[] cipherState) {
byte[] cipher = new byte[BLOCK_SIZE];
@@ -225,6 +229,10 @@ public class Camellia {
/**
* CBC encrypt nblocks blocks of data in place, using and updating iv.
+ * @param data The data
+ * @param offset The offset
+ * @param blocksNum The block number
+ * @param cipherState The cipher state
*/
public void cbcDec(byte[] data, int offset, int blocksNum, byte[] cipherState) {
byte[] lastBlock = new byte[BLOCK_SIZE];
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
index 7b8570e..7ad0eb1 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Des.java
@@ -75,6 +75,9 @@ public class Des {
/**
* MIT krb5 FIXUP(k) in s2k_des.c
+ * @param key The key byte
+ * @param offset The offset
+ * @param len The length
*/
public static void fixKey(byte[] key, int offset, int len) {
if (isWeakKey(key, offset, len)) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ec0f46b1/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Nfold.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Nfold.java b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Nfold.java
index ec8489f..a08f4ae 100644
--- a/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Nfold.java
+++ b/kerby-kerb/kerb-crypto/src/main/java/org/apache/kerby/kerberos/kerb/crypto/util/Nfold.java
@@ -38,9 +38,12 @@ public class Nfold {
/**
* representation: msb first, assume n and k are multiples of 8, and
- * that k>=16. this is the case of all the cryptosystems which are
+ * that {@code k>=16}. this is the case of all the cryptosystems which are
* likely to be used. this function can be replaced if that
* assumption ever fails.
+ * @param inBytes The input bytes
+ * @param size The size
+ * @return The output byte
*/
public static byte[] nfold(byte[] inBytes, int size) {
int inBytesNum = inBytes.length; // count inBytes byte
[09/46] directory-kerby git commit: Switch to 1.0.0-RC1-SNAPSHOT.
Added a reference to the Apache parent pom
Posted by pl...@apache.org.
Switch to 1.0.0-RC1-SNAPSHOT. Added a reference to the Apache parent pom
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/8719924c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/8719924c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/8719924c
Branch: refs/heads/pkinit-support
Commit: 8719924c77c7dcda1ae8c77600c1e76ff3a04c70
Parents: e355be4
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 15:17:59 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 15:17:59 2015 +0200
----------------------------------------------------------------------
kerby-asn1/pom.xml | 2 +-
kerby-backend/json-backend/pom.xml | 2 +-
kerby-backend/ldap-backend/pom.xml | 2 +-
kerby-backend/mavibot-backend/pom.xml | 2 +-
kerby-backend/pom.xml | 2 +-
kerby-backend/zookeeper-backend/pom.xml | 2 +-
kerby-config/pom.xml | 2 +-
kerby-dist/kdc-dist/pom.xml | 2 +-
kerby-dist/pom.xml | 4 ++--
kerby-dist/tool-dist/pom.xml | 2 +-
kerby-kdc-test/pom.xml | 2 +-
kerby-kdc/pom.xml | 2 +-
kerby-kerb/integration-test/pom.xml | 2 +-
kerby-kerb/kerb-admin/pom.xml | 2 +-
kerby-kerb/kerb-client-api-all/pom.xml | 4 ++--
kerby-kerb/kerb-client/pom.xml | 2 +-
kerby-kerb/kerb-common/pom.xml | 2 +-
kerby-kerb/kerb-core-test/pom.xml | 2 +-
kerby-kerb/kerb-core/pom.xml | 2 +-
kerby-kerb/kerb-crypto/pom.xml | 2 +-
kerby-kerb/kerb-identity-test/pom.xml | 2 +-
kerby-kerb/kerb-identity/pom.xml | 2 +-
kerby-kerb/kerb-kdc-test/pom.xml | 2 +-
kerby-kerb/kerb-server-api-all/pom.xml | 4 ++--
kerby-kerb/kerb-server/pom.xml | 2 +-
kerby-kerb/kerb-simplekdc/pom.xml | 2 +-
kerby-kerb/kerb-util/pom.xml | 2 +-
kerby-kerb/pom.xml | 2 +-
kerby-provider/pom.xml | 4 ++--
kerby-provider/token-provider/pom.xml | 2 +-
kerby-tool/client-tool/pom.xml | 2 +-
kerby-tool/kdc-tool/pom.xml | 2 +-
kerby-tool/pom.xml | 2 +-
kerby-util/pom.xml | 2 +-
pom.xml | 9 ++++++++-
35 files changed, 46 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-asn1/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-asn1/pom.xml b/kerby-asn1/pom.xml
index ada8d61..a18f9ef 100644
--- a/kerby-asn1/pom.xml
+++ b/kerby-asn1/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-backend/json-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/json-backend/pom.xml b/kerby-backend/json-backend/pom.xml
index 92512de..3b34f17 100644
--- a/kerby-backend/json-backend/pom.xml
+++ b/kerby-backend/json-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>json-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-backend/ldap-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/ldap-backend/pom.xml b/kerby-backend/ldap-backend/pom.xml
index 9838f4a..315230e 100644
--- a/kerby-backend/ldap-backend/pom.xml
+++ b/kerby-backend/ldap-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>ldap-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-backend/mavibot-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot-backend/pom.xml b/kerby-backend/mavibot-backend/pom.xml
index 50c7afe..5cda6ea 100644
--- a/kerby-backend/mavibot-backend/pom.xml
+++ b/kerby-backend/mavibot-backend/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>mavibot-backend</artifactId>
<name>Mavibot based backend</name>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/pom.xml b/kerby-backend/pom.xml
index 3a344b9..23aed47 100644
--- a/kerby-backend/pom.xml
+++ b/kerby-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerby-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-backend/zookeeper-backend/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/pom.xml b/kerby-backend/zookeeper-backend/pom.xml
index e3488b2..2f25b28 100644
--- a/kerby-backend/zookeeper-backend/pom.xml
+++ b/kerby-backend/zookeeper-backend/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-backend</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>zookeeper-backend</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-config/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-config/pom.xml b/kerby-config/pom.xml
index 7e512d6..3769c61 100644
--- a/kerby-config/pom.xml
+++ b/kerby-config/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index 892edf4..a401183 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-dist</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kdc-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/pom.xml b/kerby-dist/pom.xml
index b466baa..1fa2454 100644
--- a/kerby-dist/pom.xml
+++ b/kerby-dist/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerby-dist</artifactId>
@@ -48,4 +48,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-dist/tool-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/pom.xml b/kerby-dist/tool-dist/pom.xml
index afb1c09..a8c823b 100644
--- a/kerby-dist/tool-dist/pom.xml
+++ b/kerby-dist/tool-dist/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-dist</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>tool-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kdc-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc-test/pom.xml b/kerby-kdc-test/pom.xml
index 68d8c52..576761b 100644
--- a/kerby-kdc-test/pom.xml
+++ b/kerby-kdc-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerby-kdc-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kdc/pom.xml b/kerby-kdc/pom.xml
index 8845e0d..08ca131 100644
--- a/kerby-kdc/pom.xml
+++ b/kerby-kdc/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerby-kdc</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/pom.xml b/kerby-kerb/integration-test/pom.xml
index 36fcff6..769bfc4 100644
--- a/kerby-kerb/integration-test/pom.xml
+++ b/kerby-kerb/integration-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>integration-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-admin/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-admin/pom.xml b/kerby-kerb/kerb-admin/pom.xml
index 1b0cec4..e44c4a2 100644
--- a/kerby-kerb/kerb-admin/pom.xml
+++ b/kerby-kerb/kerb-admin/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-admin</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-client-api-all/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client-api-all/pom.xml b/kerby-kerb/kerb-client-api-all/pom.xml
index 7fdffe5..9e4f2c6 100644
--- a/kerby-kerb/kerb-client-api-all/pom.xml
+++ b/kerby-kerb/kerb-client-api-all/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-client-api-all</artifactId>
@@ -66,4 +66,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-client/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/pom.xml b/kerby-kerb/kerb-client/pom.xml
index f769ab2..a6cd0df 100644
--- a/kerby-kerb/kerb-client/pom.xml
+++ b/kerby-kerb/kerb-client/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-client</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-common/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/pom.xml b/kerby-kerb/kerb-common/pom.xml
index c745928..f47fba6 100644
--- a/kerby-kerb/kerb-common/pom.xml
+++ b/kerby-kerb/kerb-common/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-common</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-core-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/pom.xml b/kerby-kerb/kerb-core-test/pom.xml
index dc79b28..9224218 100644
--- a/kerby-kerb/kerb-core-test/pom.xml
+++ b/kerby-kerb/kerb-core-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-core-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-core/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/pom.xml b/kerby-kerb/kerb-core/pom.xml
index aa01230..d5e85c7 100644
--- a/kerby-kerb/kerb-core/pom.xml
+++ b/kerby-kerb/kerb-core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-core</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-crypto/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-crypto/pom.xml b/kerby-kerb/kerb-crypto/pom.xml
index ed7e8f5..4975afd 100644
--- a/kerby-kerb/kerb-crypto/pom.xml
+++ b/kerby-kerb/kerb-crypto/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-crypto</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-identity-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity-test/pom.xml b/kerby-kerb/kerb-identity-test/pom.xml
index 8224b40..ee0f02e 100644
--- a/kerby-kerb/kerb-identity-test/pom.xml
+++ b/kerby-kerb/kerb-identity-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-identity-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-identity/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity/pom.xml b/kerby-kerb/kerb-identity/pom.xml
index d2dce3f..890defd 100644
--- a/kerby-kerb/kerb-identity/pom.xml
+++ b/kerby-kerb/kerb-identity/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-identity</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-kdc-test/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/pom.xml b/kerby-kerb/kerb-kdc-test/pom.xml
index d8b15a3..c592a01 100644
--- a/kerby-kerb/kerb-kdc-test/pom.xml
+++ b/kerby-kerb/kerb-kdc-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-kdc-test</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-server-api-all/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server-api-all/pom.xml b/kerby-kerb/kerb-server-api-all/pom.xml
index 7a930c3..5d77d8c 100644
--- a/kerby-kerb/kerb-server-api-all/pom.xml
+++ b/kerby-kerb/kerb-server-api-all/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-server-api-all</artifactId>
@@ -71,4 +71,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-server/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/pom.xml b/kerby-kerb/kerb-server/pom.xml
index bac6dff..0f370f2 100644
--- a/kerby-kerb/kerb-server/pom.xml
+++ b/kerby-kerb/kerb-server/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-server</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-simplekdc/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/pom.xml b/kerby-kerb/kerb-simplekdc/pom.xml
index 8b1cdba..ee7a5d7 100644
--- a/kerby-kerb/kerb-simplekdc/pom.xml
+++ b/kerby-kerb/kerb-simplekdc/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-simplekdc</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/kerb-util/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/pom.xml b/kerby-kerb/kerb-util/pom.xml
index e50f748..a1d4380 100644
--- a/kerby-kerb/kerb-util/pom.xml
+++ b/kerby-kerb/kerb-util/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-kerb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerb-util</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-kerb/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-kerb/pom.xml b/kerby-kerb/pom.xml
index 0ff1b38..2cc3241 100644
--- a/kerby-kerb/pom.xml
+++ b/kerby-kerb/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerby-kerb</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-provider/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-provider/pom.xml b/kerby-provider/pom.xml
index 412a1fd..f7b1cf0 100644
--- a/kerby-provider/pom.xml
+++ b/kerby-provider/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>kerby-all</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,4 +30,4 @@
<module>token-provider</module>
</modules>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-provider/token-provider/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/pom.xml b/kerby-provider/token-provider/pom.xml
index c321271..60fd64d 100644
--- a/kerby-provider/token-provider/pom.xml
+++ b/kerby-provider/token-provider/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>kerby-provider</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1@-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-tool/client-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/pom.xml b/kerby-tool/client-tool/pom.xml
index 3a4e588..7dd0e8a 100644
--- a/kerby-tool/client-tool/pom.xml
+++ b/kerby-tool/client-tool/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-tool</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>client-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-tool/kdc-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/kdc-tool/pom.xml b/kerby-tool/kdc-tool/pom.xml
index 42ef0de..ab13016 100644
--- a/kerby-tool/kdc-tool/pom.xml
+++ b/kerby-tool/kdc-tool/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-tool</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kdc-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-tool/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-tool/pom.xml b/kerby-tool/pom.xml
index ddae058..00d4489 100644
--- a/kerby-tool/pom.xml
+++ b/kerby-tool/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerby-tool</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/kerby-util/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-util/pom.xml b/kerby-util/pom.xml
index e3405fb..42683e5 100644
--- a/kerby-util/pom.xml
+++ b/kerby-util/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>kerby-util</artifactId>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/8719924c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6a40c72..a78856d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,9 +15,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>17</version>
+ <relativePath />
+ </parent>
+
<groupId>org.apache.kerby</groupId>
<artifactId>kerby-all</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Kerby Project</name>
[10/46] directory-kerby git commit: Switched to 1.0.0-RC1-SNAPSHOT
Posted by pl...@apache.org.
Switched to 1.0.0-RC1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1134d210
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1134d210
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1134d210
Branch: refs/heads/pkinit-support
Commit: 1134d21088a691cf0b22852d17d48b7e27ef7670
Parents: 8719924
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Aug 22 15:36:47 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Aug 22 15:36:47 2015 +0200
----------------------------------------------------------------------
benchmark/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1134d210/benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 5ea9714..1fa8cc4 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>kerby-all</artifactId>
<groupId>org.apache.kerby</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</parent>
<artifactId>benchmark</artifactId>
[33/46] directory-kerby git commit: Fix some warnings of javadoc.
Posted by pl...@apache.org.
Fix some warnings of javadoc.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/61e0f0f5
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/61e0f0f5
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/61e0f0f5
Branch: refs/heads/pkinit-support
Commit: 61e0f0f50622e5f30055651a55e4e12a066ab5ab
Parents: 844f82b
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 16:34:46 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 16:34:46 2015 +0800
----------------------------------------------------------------------
.../identitybackend/LdapIdentityGetHelper.java | 20 ++++++++--------
.../java/org/apache/kerby/MavibotBackend.java | 2 +-
.../identitybackend/IdentityZNodeHelper.java | 2 +-
.../kerberos/kdc/identitybackend/ZKUtil.java | 24 +++++++++++++-------
.../integration/test/jaas/TokenJaasKrbUtil.java | 4 ++--
.../kerberos/kerb/server/SimpleKdcServer.java | 13 ++++++-----
.../provider/token/JwtTokenDecoder.java | 4 ++--
7 files changed, 39 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/61e0f0f5/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 3ea17ae..ba19ae0 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
@@ -42,7 +42,7 @@ public class LdapIdentityGetHelper {
/**
* Get principal name.
- * @throws LdapInvalidAttributeValueException
+ * @throws LdapInvalidAttributeValueException e
* @return principal name
*/
public PrincipalName getPrincipalName() throws LdapInvalidAttributeValueException {
@@ -53,7 +53,7 @@ public class LdapIdentityGetHelper {
/**
* Get key version.
- * @throws LdapInvalidAttributeValueException
+ * @throws LdapInvalidAttributeValueException e
* @return key version
*/
public int getKeyVersion() throws LdapInvalidAttributeValueException {
@@ -64,7 +64,7 @@ public class LdapIdentityGetHelper {
/**
* Get keys.
- * @throws IOException
+ * @throws IOException e
* @return keys
*/
public List<EncryptionKey> getKeys() throws IOException {
@@ -82,8 +82,8 @@ public class LdapIdentityGetHelper {
/**
* Get created time.
- * @throws LdapInvalidAttributeValueException
- * @throws ParseException
+ * @throws LdapInvalidAttributeValueException e
+ * @throws ParseException e
* @return created time
*/
public KerberosTime getCreatedTime() throws LdapInvalidAttributeValueException,
@@ -94,8 +94,8 @@ public class LdapIdentityGetHelper {
/**
* Get expire time.
- * @throws LdapInvalidAttributeValueException
- * @throws ParseException
+ * @throws LdapInvalidAttributeValueException e
+ * @throws ParseException e
* @return the expire time
*/
public KerberosTime getExpireTime() throws LdapInvalidAttributeValueException,
@@ -106,7 +106,7 @@ public class LdapIdentityGetHelper {
/**
* Get whether disabled.
- * @throws LdapInvalidAttributeValueException
+ * @throws LdapInvalidAttributeValueException e
* @return whether this krb5 account is disabled
*/
public boolean getDisabled() throws LdapInvalidAttributeValueException {
@@ -116,7 +116,7 @@ public class LdapIdentityGetHelper {
/**
* Get kdc flags.
- * @throws LdapInvalidAttributeValueException
+ * @throws LdapInvalidAttributeValueException e
* @return kdc flags
*/
public int getKdcFlags() throws LdapInvalidAttributeValueException {
@@ -126,7 +126,7 @@ public class LdapIdentityGetHelper {
/**
* Get whether locked.
- * @throws LdapInvalidAttributeValueException
+ * @throws LdapInvalidAttributeValueException e
* @return whether the krb5 account is locked
*/
public boolean getLocked() throws LdapInvalidAttributeValueException {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/61e0f0f5/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java b/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
index f0abc7e..7c31617 100644
--- a/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
+++ b/kerby-backend/mavibot-backend/src/main/java/org/apache/kerby/MavibotBackend.java
@@ -61,7 +61,7 @@ public class MavibotBackend extends AbstractIdentityBackend {
* @param location
* the File handle pointing to the database file or the directory
* where it is present
- * @throws Exception
+ * @throws Exception e
*/
public MavibotBackend(File location) throws Exception {
String dbPath = location.getAbsolutePath();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/61e0f0f5/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
index 565e781..a59ede8 100644
--- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
+++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/IdentityZNodeHelper.java
@@ -180,7 +180,7 @@ public class IdentityZNodeHelper {
/**
* Get identity names.
*
- * @throws org.apache.zookeeper.KeeperException
+ * @throws org.apache.zookeeper.KeeperException e
* @param zk The zookeeper
* @return The list of principal names.
*/
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/61e0f0f5/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java
----------------------------------------------------------------------
diff --git a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java
index 128c59f..8ebe100 100644
--- a/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java
+++ b/kerby-backend/zookeeper-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/ZKUtil.java
@@ -44,7 +44,7 @@ public class ZKUtil {
/**
* Check if the specified node exists. Sets no watches.
- * @throws org.apache.zookeeper.KeeperException
+ * @throws org.apache.zookeeper.KeeperException e
* @param zk Zookeeper.
* @param node Node.
* @return The version.
@@ -64,7 +64,7 @@ public class ZKUtil {
/**
* Sets the data of the existing znode to be the specified data.
- * @throws org.apache.zookeeper.KeeperException
+ * @throws org.apache.zookeeper.KeeperException e
* @param zk Zookeeper
* @param node Node
* @param data Data
@@ -86,6 +86,7 @@ public class ZKUtil {
* @param zk Zookeeper.
* @param node Node.
* @param data Data.
+ * @throws KeeperException e
*/
public static void createSetData(final ZooKeeper zk, final String node,
final byte[] data)
@@ -99,7 +100,9 @@ public class ZKUtil {
/**
* Creates the specified node and all parent nodes required for it to exist.
- * @throws org.apache.zookeeper.KeeperException
+ * @param zk The zookeeper
+ * @param node The znode
+ * @throws org.apache.zookeeper.KeeperException e
*/
public static void createWithParents(ZooKeeper zk, String node)
throws KeeperException {
@@ -110,7 +113,7 @@ public class ZKUtil {
* Creates the specified node and all parent nodes required for it to exist. The creation of
* parent znodes is not atomic with the leafe znode creation but the data is written atomically
* when the leaf node is created.
- * @throws org.apache.zookeeper.KeeperException
+ * @throws org.apache.zookeeper.KeeperException e
* @param zk zookeeper.
* @param node node
* @param data data
@@ -146,6 +149,7 @@ public class ZKUtil {
/**
* Returns the full path of the immediate parent of the specified node.
* null if passed the root node or an invalid node
+ * @param node The znode
* @return index
*/
public static String getParent(String node) {
@@ -155,8 +159,10 @@ public class ZKUtil {
/**
* Get znode data. Does not set a watcher.
- * @throws org.apache.zookeeper.KeeperException
- * @throws java.lang.InterruptedException
+ * @param zk The zookeeper
+ * @param node The znode
+ * @throws org.apache.zookeeper.KeeperException e
+ * @throws java.lang.InterruptedException e
* @return Data of the node
*/
public static byte[] getData(ZooKeeper zk, String node)
@@ -176,7 +182,9 @@ public class ZKUtil {
/**
* Lists the children of the specified node without setting any watches.
* null if parent does not exist
- * @throws org.apache.zookeeper.KeeperException
+ * @param zk The zookeeper.
+ * @param node The znode
+ * @throws org.apache.zookeeper.KeeperException e
* @return children
*/
public static List<String> listChildrenNoWatch(ZooKeeper zk, String node)
@@ -198,7 +206,7 @@ public class ZKUtil {
* If the node does not exist, just returns.
* Sets no watches. Throws all exceptions besides dealing with deletion of
* children.
- * @throws KeeperException
+ * @throws KeeperException e
* @param zk The zookeeper.
* @param node The node to be deleted.
*/
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/61e0f0f5/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java
index 42a203d..d7a91ab 100644
--- a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java
+++ b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenJaasKrbUtil.java
@@ -40,12 +40,12 @@ public class TokenJaasKrbUtil {
/**
* Login using token cache.
*
- * @throws javax.security.auth.login.LoginException
* @param principal The client principal name
* @param tokenCache the token cache for login
* @param armorCache the armor cache for fast preauth
* @param ccache The file to store the tgt ticket
* @return the authenticated Subject
+ * @throws LoginException e
*/
public static Subject loginUsingToken(
String principal, File tokenCache, File armorCache, File ccache)
@@ -65,12 +65,12 @@ public class TokenJaasKrbUtil {
/**
* Login using token string.
*
- * @throws javax.security.auth.login.LoginException
* @param principal The client principal name
* @param tokenStr the token string for login
* @param armorCache the armor cache for fast preauth
* @param ccache The file to store the tgt ticket
* @return the authenticated Subject
+ * @throws LoginException e
*/
public static Subject loginUsingToken(
String principal, String tokenStr, File armorCache, File ccache)
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/61e0f0f5/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
index 882cd01..0a7ad1d 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
@@ -166,7 +166,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Create principal with principal name.
*
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
* @param principal The principal name
*/
public void createPrincipal(String principal) throws KrbException {
@@ -176,7 +176,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Create principal with principal name and password.
*
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
* @param principal The principal name
* @param password The password to create keys
*/
@@ -188,7 +188,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Create principals.
*
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
* @param principals The principal list
*/
public void createPrincipals(String ... principals) throws KrbException {
@@ -200,7 +200,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Creates principals and export their keys to the specified keytab file.
*
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
* @param keytabFile The keytab file to store principal keys
* @param principals The principals to be create
*/
@@ -213,7 +213,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Delete principals.
*
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
* @param principals The principals to be delete
*/
public void deletePrincipals(String ... principals) throws KrbException {
@@ -225,7 +225,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Delete principal.
*
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
* @param principal The principal to be delete
*/
public void deletePrincipal(String principal) throws KrbException {
@@ -236,6 +236,7 @@ public class SimpleKdcServer extends KdcServer {
* Export principals to keytab file.
*
* @param keytabFile The keytab file
+ * @throws KrbException e
*/
public void exportPrincipals(File keytabFile) throws KrbException {
kadmin.exportKeytab(keytabFile);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/61e0f0f5/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java
----------------------------------------------------------------------
diff --git a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java
index a99af62..ff9469d 100644
--- a/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java
+++ b/kerby-provider/token-provider/src/main/java/org/apache/kerby/kerberos/provider/token/JwtTokenDecoder.java
@@ -129,7 +129,7 @@ public class JwtTokenDecoder implements TokenDecoder {
/**
* Decrypt the Encrypted JWT
*
- * @throws java.io.IOException
+ * @throws java.io.IOException e
* @param encryptedJWT an encrypted JWT
*/
public void decryptEncryptedJWT(EncryptedJWT encryptedJWT) throws IOException {
@@ -153,7 +153,7 @@ public class JwtTokenDecoder implements TokenDecoder {
/**
* verify the Signed JWT
*
- * @throws java.io.IOException
+ * @throws java.io.IOException e
* @param signedJWT a signed JWT
* @return whether verify success
*/
[37/46] directory-kerby git commit: Remove some plugins in pom.xml
which already present in the parent's pom.
Posted by pl...@apache.org.
Remove some plugins in pom.xml which already present in the parent's pom.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/5dc62bb2
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/5dc62bb2
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/5dc62bb2
Branch: refs/heads/pkinit-support
Commit: 5dc62bb2b797e46337d97e9f4a4b248712360c4e
Parents: 28e7a0c
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Aug 25 20:49:09 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Aug 25 20:49:09 2015 +0800
----------------------------------------------------------------------
pom.xml | 50 --------------------------------------------------
1 file changed, 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5dc62bb2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6528f6e..4f13929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,37 +189,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- <inherited>true</inherited>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.6.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.4</version>
<dependencies>
@@ -321,20 +290,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</pluginManagement>
@@ -367,11 +322,6 @@
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
-
</plugins>
</build>
[31/46] directory-kerby git commit: Fix javadoc issues in kerb-core
module.
Posted by pl...@apache.org.
Fix javadoc issues in kerb-core module.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/fd7f6862
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/fd7f6862
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/fd7f6862
Branch: refs/heads/pkinit-support
Commit: fd7f6862e92125f5580db97bf72fad167ea501b2
Parents: 205295a
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Aug 24 15:54:48 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Aug 24 15:54:48 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/asn1/Asn1InputBuffer.java | 2 +-
.../kerby/kerberos/kerb/client/KrbClient.java | 3 +-
.../kerby/kerberos/kerb/client/KrbConfig.java | 31 +++++++++++++++++---
.../kerby/kerberos/kerb/client/KrbContext.java | 6 ++++
.../kerb/client/impl/InternalKrbClient.java | 9 +++---
.../kerb/client/preauth/PreauthHandler.java | 2 ++
.../kerberos/kerb/transport/KrbTransport.java | 1 +
.../apache/kerby/kerberos/kerb/KrbRuntime.java | 2 ++
.../kerby/kerberos/kerb/provider/PkiLoader.java | 24 +++++++--------
.../kerberos/kerb/provider/TokenDecoder.java | 6 ++--
.../kerberos/kerb/provider/TokenEncoder.java | 6 ++--
.../kerby/kerberos/kerb/spec/KerberosTime.java | 15 ++++++++--
.../kerberos/kerb/spec/base/AuthToken.java | 16 +++++-----
.../kerby/kerberos/kerb/spec/base/KrbToken.java | 6 ++++
.../kerb/identity/backend/BackendTestBase.java | 1 +
.../backend/AbstractIdentityBackend.java | 2 ++
.../main/java/org/apache/kerby/util/IOUtil.java | 6 ++--
17 files changed, 98 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java
index 2441749..aeb5864 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/Asn1InputBuffer.java
@@ -62,7 +62,7 @@ public class Asn1InputBuffer {
* Parse and read ASN1 object from the stream. If it's already
* exhausted then null will be returned to indicate the end.
* @return an ASN1 object if available otherwise null
- * @throws IOException
+ * @throws IOException e
*/
public Asn1Type read() throws IOException {
if (!limitedBuffer.available()) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/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 2067a6e..db318fb 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
@@ -48,6 +48,7 @@ public class KrbClient {
/**
* Default constructor.
+ * @throws KrbException e
*/
public KrbClient() throws KrbException {
this.krbConfig = ClientUtil.getDefaultConfig();
@@ -165,7 +166,7 @@ public class KrbClient {
* Request a TGT with user plain credential
* @param principal The principal
* @param password The password
- * @return
+ * @return The tgt ticket
* @throws KrbException e
*/
public TgtTicket requestTgtWithPassword(String principal,
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/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 a5886fd..2f88a91 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
@@ -37,7 +37,7 @@ public class KrbConfig extends Conf {
/**
* Get KDC host name
*
- * @return
+ * @return The kdc host
*/
public String getKdcHost() {
return getString(KrbConfigKey.KDC_HOST);
@@ -46,7 +46,7 @@ public class KrbConfig extends Conf {
/**
* Get KDC port, as both TCP and UDP ports
*
- * @return
+ * @return The kdc host
*/
public int getKdcPort() {
Integer kdcPort = KrbConfHelper.getIntUnderSection(this,
@@ -60,7 +60,7 @@ public class KrbConfig extends Conf {
/**
* Get KDC TCP port
*
- * @return
+ * @return The kdc tcp port
*/
public int getKdcTcpPort() {
Integer kdcPort = KrbConfHelper.getIntUnderSection(this,
@@ -94,7 +94,7 @@ public class KrbConfig extends Conf {
/**
* Get KDC UDP port
*
- * @return
+ * @return The kdc udp port
*/
public int getKdcUdpPort() {
Integer kdcPort = KrbConfHelper.getIntUnderSection(this,
@@ -107,6 +107,7 @@ public class KrbConfig extends Conf {
/**
* Get KDC realm.
+ * @return The kdc realm
*/
public String getKdcRealm() {
return KrbConfHelper.getStringUnderSection(this, KrbConfigKey.KDC_REALM);
@@ -114,6 +115,7 @@ public class KrbConfig extends Conf {
/**
* Get whether preatuh is required.
+ * @return true if preauth required
*/
public boolean isPreauthRequired() {
return getBoolean(KrbConfigKey.PREAUTH_REQUIRED);
@@ -121,6 +123,7 @@ public class KrbConfig extends Conf {
/**
* Get tgs principal.
+ * @return The tgs principal
*/
public String getTgsPrincipal() {
return getString(KrbConfigKey.TGS_PRINCIPAL);
@@ -128,6 +131,7 @@ public class KrbConfig extends Conf {
/**
* Get allowable clock skew.
+ * @return The allowable clock skew
*/
public long getAllowableClockSkew() {
return KrbConfHelper.getLongUnderSection(this, KrbConfigKey.CLOCKSKEW);
@@ -135,6 +139,7 @@ public class KrbConfig extends Conf {
/**
* Get whether empty addresses allowed.
+ * @return true if empty address is allowed
*/
public boolean isEmptyAddressesAllowed() {
return getBoolean(KrbConfigKey.EMPTY_ADDRESSES_ALLOWED);
@@ -142,6 +147,7 @@ public class KrbConfig extends Conf {
/**
* Get whether forward is allowed.
+ * @return true if forward is allowed
*/
public boolean isForwardableAllowed() {
return KrbConfHelper.getBooleanUnderSection(this, KrbConfigKey.FORWARDABLE);
@@ -149,6 +155,7 @@ public class KrbConfig extends Conf {
/**
* Get whether post dated is allowed.
+ * @return true if post dated is allowed
*/
public boolean isPostdatedAllowed() {
return getBoolean(KrbConfigKey.POSTDATED_ALLOWED);
@@ -156,6 +163,7 @@ public class KrbConfig extends Conf {
/**
* Get whether proxy is allowed.
+ * @return true if proxy is allowed
*/
public boolean isProxiableAllowed() {
return KrbConfHelper.getBooleanUnderSection(this, KrbConfigKey.PROXIABLE);
@@ -163,6 +171,7 @@ public class KrbConfig extends Conf {
/**
* Get whether renew is allowed.
+ * @return true if renew is allowed
*/
public boolean isRenewableAllowed() {
return getBoolean(KrbConfigKey.RENEWABLE_ALLOWED);
@@ -170,6 +179,7 @@ public class KrbConfig extends Conf {
/**
* Get maximum renewable life time.
+ * @return The maximum renewable life time
*/
public long getMaximumRenewableLifetime() {
return getLong(KrbConfigKey.MAXIMUM_RENEWABLE_LIFETIME);
@@ -177,6 +187,7 @@ public class KrbConfig extends Conf {
/**
* Get maximum ticket life time.
+ * @return The maximum ticket life time
*/
public long getMaximumTicketLifetime() {
return getLong(KrbConfigKey.MAXIMUM_TICKET_LIFETIME);
@@ -184,6 +195,7 @@ public class KrbConfig extends Conf {
/**
* Get minimum ticket life time.
+ * @return The minimum ticket life time
*/
public long getMinimumTicketLifetime() {
return getLong(KrbConfigKey.MINIMUM_TICKET_LIFETIME);
@@ -191,6 +203,7 @@ public class KrbConfig extends Conf {
/**
* Get encryption types.
+ * @return encryption type list
*/
public List<EncryptionType> getEncryptionTypes() {
return KrbConfHelper.getEncTypesUnderSection(this, KrbConfigKey.PERMITTED_ENCTYPES);
@@ -198,6 +211,7 @@ public class KrbConfig extends Conf {
/**
* Get whether pa encrypt timestamp required.
+ * @return true if pa encrypt time required
*/
public boolean isPaEncTimestampRequired() {
return getBoolean(KrbConfigKey.PA_ENC_TIMESTAMP_REQUIRED);
@@ -205,6 +219,7 @@ public class KrbConfig extends Conf {
/**
* Get whether body checksum verified.
+ * @return true if body checksum verified
*/
public boolean isBodyChecksumVerified() {
return getBoolean(KrbConfigKey.VERIFY_BODY_CHECKSUM);
@@ -212,6 +227,7 @@ public class KrbConfig extends Conf {
/**
* Get default realm.
+ * @return The default realm
*/
public String getDefaultRealm() {
return KrbConfHelper.getStringUnderSection(this, KrbConfigKey.DEFAULT_REALM);
@@ -219,6 +235,7 @@ public class KrbConfig extends Conf {
/**
* Get whether dns look up kdc.
+ * @return true if dnc look up kdc
*/
public boolean getDnsLookUpKdc() {
return KrbConfHelper.getBooleanUnderSection(this, KrbConfigKey.DNS_LOOKUP_KDC);
@@ -226,6 +243,7 @@ public class KrbConfig extends Conf {
/**
* Get whether dns look up realm.
+ * @return true if dns look up realm
*/
public boolean getDnsLookUpRealm() {
return KrbConfHelper.getBooleanUnderSection(this, KrbConfigKey.DNS_LOOKUP_REALM);
@@ -233,6 +251,7 @@ public class KrbConfig extends Conf {
/**
* Get whether allow weak crypto.
+ * @return true if allow weak crypto
*/
public boolean getAllowWeakCrypto() {
return KrbConfHelper.getBooleanUnderSection(this, KrbConfigKey.ALLOW_WEAK_CRYPTO);
@@ -240,6 +259,7 @@ public class KrbConfig extends Conf {
/**
* Get ticket life time.
+ * @return The ticket life time
*/
public long getTicketLifetime() {
return KrbConfHelper.getLongUnderSection(this, KrbConfigKey.TICKET_LIFETIME);
@@ -247,6 +267,7 @@ public class KrbConfig extends Conf {
/**
* Get renew life time.
+ * @return The renew life time
*/
public long getRenewLifetime() {
return KrbConfHelper.getLongUnderSection(this, KrbConfigKey.RENEW_LIFETIME);
@@ -254,6 +275,7 @@ public class KrbConfig extends Conf {
/**
* Get default tgs encryption types.
+ * @return The tgs encryption type list
*/
public List<EncryptionType> getDefaultTgsEnctypes() {
return KrbConfHelper.getEncTypesUnderSection(this, KrbConfigKey.DEFAULT_TGS_ENCTYPES);
@@ -261,6 +283,7 @@ public class KrbConfig extends Conf {
/**
* Get default ticket encryption types.
+ * @return The encryption type list
*/
public List<EncryptionType> getDefaultTktEnctypes() {
return KrbConfHelper.getEncTypesUnderSection(this, KrbConfigKey.DEFAULT_TKT_ENCTYPES);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbContext.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbContext.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbContext.java
index a69a607..b74b4fc 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbContext.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbContext.java
@@ -29,6 +29,7 @@ public class KrbContext {
/**
* Init with krbsetting.
+ * @param krbSetting The krb setting
*/
public void init(KrbSetting krbSetting) {
this.krbSetting = krbSetting;
@@ -38,6 +39,7 @@ public class KrbContext {
/**
* Get krbsetting.
+ * @return The krb setting
*/
public KrbSetting getKrbSetting() {
return krbSetting;
@@ -45,6 +47,7 @@ public class KrbContext {
/**
* Get krbconfig.
+ * @return The krb config
*/
public KrbConfig getConfig() {
return krbSetting.getKrbConfig();
@@ -52,6 +55,7 @@ public class KrbContext {
/**
* Generate nonce.
+ * @return nonce
*/
public int generateNonce() {
return Nonce.value();
@@ -59,6 +63,7 @@ public class KrbContext {
/**
* Get ticket valid time.
+ * @return The ticket valid time
*/
public long getTicketValidTime() {
return 8 * 60 * 60 * 1000;
@@ -66,6 +71,7 @@ public class KrbContext {
/**
* Get preauth handler.
+ * @return The preauth handler
*/
public PreauthHandler getPreauthHandler() {
return preauthHandler;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/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 6ee378c..c30c1fa 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
@@ -32,6 +32,7 @@ public interface InternalKrbClient {
/**
* Init with all the necessary options.
+ * @throws KrbException e
*/
void init() throws KrbException;
@@ -43,17 +44,17 @@ public interface InternalKrbClient {
/**
* Request a Ticket Granting Ticket.
- * @param requestOptions
+ * @param requestOptions The request options
* @return a TGT
- * @throws KrbException
+ * @throws KrbException e
*/
TgtTicket requestTgtTicket(KOptions requestOptions) throws KrbException;
/**
* Request a service ticket.
- * @param requestOptions
+ * @param requestOptions The request options
* @return service ticket
- * @throws KrbException
+ * @throws KrbException e
*/
ServiceTicket requestServiceTicket(KOptions requestOptions) throws KrbException;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/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 fec4b6e..7494a5c 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
@@ -77,6 +77,8 @@ public class PreauthHandler {
/**
* Process preauth inputs and options, prepare and generate pdata to be out
+ * @param kdcRequest The kdc request
+ * @throws KrbException e
*/
public void preauth(KdcRequest kdcRequest) throws KrbException {
PreauthContext preauthContext = kdcRequest.getPreauthContext();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java
index 3ee54a6..29cbd95 100644
--- a/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java
+++ b/kerby-kerb/kerb-common/src/main/java/org/apache/kerby/kerberos/kerb/transport/KrbTransport.java
@@ -31,6 +31,7 @@ public interface KrbTransport {
/**
* Send out a Kerberos message to remote peer.
* @param message The message to be sent
+ * @throws IOException e
*/
void sendMessage(ByteBuffer message) throws IOException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java
index 7b35332..d864627 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbRuntime.java
@@ -46,6 +46,7 @@ public class KrbRuntime {
/**
* Set token provider.
+ * @param tokenProvider The token provider
*/
public static synchronized void setTokenProvider(TokenProvider tokenProvider) {
KrbRuntime.tokenProvider = tokenProvider;
@@ -64,6 +65,7 @@ public class KrbRuntime {
/**
* Setup pkiProvider.
+ * @param pkiProvider The pki provider
*/
public static synchronized void setPkiProvider(PkiProvider pkiProvider) {
KrbRuntime.pkiProvider = pkiProvider;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/PkiLoader.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/PkiLoader.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/PkiLoader.java
index 42e232f..4739e1a 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/PkiLoader.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/PkiLoader.java
@@ -33,36 +33,36 @@ public interface PkiLoader {
/**
* Load certificates from a cert file.
- * @param certFile
- * @return
- * @throws KrbException
+ * @param certFile The cert file
+ * @return The certificates
+ * @throws KrbException e
*/
List<Certificate> loadCerts(String certFile) throws KrbException;
/**
* Load certificates from an input stream.
- * @param inputStream
- * @return
- * @throws KrbException
+ * @param inputStream The input stream
+ * @return The certificates
+ * @throws KrbException e
*/
List<Certificate> loadCerts(InputStream inputStream) throws KrbException;
/**
* Load private key from a key file with a password.
- * @param keyFile
- * @param password
+ * @param keyFile The key file
+ * @param password The password
* @return private key
- * @throws KrbException
+ * @throws KrbException e
*/
PrivateKey loadPrivateKey(String keyFile,
String password) throws KrbException;
/**
* Load a private key from input stream with a password.
- * @param inputStream
- * @param password
+ * @param inputStream The input stream
+ * @param password The password
* @return private key
- * @throws KrbException
+ * @throws KrbException e
*/
PrivateKey loadPrivateKey(InputStream inputStream,
String password) throws KrbException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenDecoder.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenDecoder.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenDecoder.java
index 90e9260..e52a9b3 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenDecoder.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenDecoder.java
@@ -30,15 +30,17 @@ public interface TokenDecoder {
/**
* Decode a token from a bytes array.
- * @param content
+ * @param content The content
* @return token
+ * @throws IOException e
*/
AuthToken decodeFromBytes(byte[] content) throws IOException;
/**
* Decode a token from a string.
- * @param content
+ * @param content The content
* @return token
+ * @throws IOException e
*/
AuthToken decodeFromString(String content) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenEncoder.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenEncoder.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenEncoder.java
index 15d1483..90d06be 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenEncoder.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/provider/TokenEncoder.java
@@ -29,15 +29,17 @@ public interface TokenEncoder {
/**
* Encode a token resulting in a bytes array.
- * @param token
+ * @param token The auth token
* @return bytes array
+ * @throws KrbException e
*/
byte[] encodeAsBytes(AuthToken token) throws KrbException;
/**
* Encode a token resulting in a string.
- * @param token
+ * @param token The auth token
* @return string representation
+ * @throws KrbException e
*/
String encodeAsString(AuthToken token) throws KrbException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
index ed1b5a3..1474006 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
@@ -53,14 +53,14 @@ public class KerberosTime extends Asn1GeneralizedTime {
}
/**
- * time in milliseconds
+ * @param time in milliseconds
*/
public KerberosTime(long time) {
super(time);
}
/**
- * Return time in milliseconds
+ * @return time in milliseconds
*/
public long getTime() {
return getValue().getTime();
@@ -75,6 +75,7 @@ public class KerberosTime extends Asn1GeneralizedTime {
/**
* get the time in seconds
+ * @return The time
*/
public long getTimeInSeconds() {
return getTime() / 1000;
@@ -86,6 +87,7 @@ public class KerberosTime extends Asn1GeneralizedTime {
/**
* @param time in milliseconds
+ * @return true if less
*/
public boolean lessThan(long time) {
return getValue().getTime() < time;
@@ -93,6 +95,7 @@ public class KerberosTime extends Asn1GeneralizedTime {
/**
* @param ktime compare with milliseconds
+ * @return true if greater
*/
public boolean greaterThan(KerberosTime ktime) {
return getValue().compareTo(ktime.getValue()) > 0;
@@ -100,6 +103,8 @@ public class KerberosTime extends Asn1GeneralizedTime {
/**
* time in milliseconds
+ * @param clockSkew The clock skew
+ * @return true if in clock skew
*/
public boolean isInClockSkew(long clockSkew) {
long delta = Math.abs(getTime() - System.currentTimeMillis());
@@ -113,7 +118,9 @@ public class KerberosTime extends Asn1GeneralizedTime {
}
/**
- * time in milliseconds
+ * time in milliseconds.
+ * @param duration The duration
+ * @return The kerberos time
*/
public KerberosTime extend(long duration) {
long result = getTime() + duration;
@@ -122,6 +129,8 @@ public class KerberosTime extends Asn1GeneralizedTime {
/**
* Return diff time in milliseconds
+ * @param other The kerberos time
+ * @return The diff time
*/
public long diff(KerberosTime other) {
return getTime() - other.getTime();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/AuthToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/AuthToken.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/AuthToken.java
index 1ac9429..e13fe6c 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/AuthToken.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/AuthToken.java
@@ -36,7 +36,7 @@ public interface AuthToken {
/**
* Set token subject
- * @param sub
+ * @param sub The token subject
*/
void setSubject(String sub);
@@ -48,7 +48,7 @@ public interface AuthToken {
/**
* Set token issuer
- * @param issuer
+ * @param issuer The token issuer
*/
void setIssuer(String issuer);
@@ -60,7 +60,7 @@ public interface AuthToken {
/**
* Set token audiences
- * @param audiences
+ * @param audiences The token audiences
*/
void setAudiences(List<String> audiences);
@@ -100,7 +100,7 @@ public interface AuthToken {
/**
* Set token expired time
- * @param exp
+ * @param exp The token expired time
*/
void setExpirationTime(Date exp);
@@ -112,7 +112,7 @@ public interface AuthToken {
/**
* Set token not before time.
- * @param nbt
+ * @param nbt The time
*/
void setNotBeforeTime(Date nbt);
@@ -124,7 +124,7 @@ public interface AuthToken {
/**
* Set token issued at time.
- * @param iat
+ * @param iat Time time when token issued
*/
void setIssueTime(Date iat);
@@ -136,8 +136,8 @@ public interface AuthToken {
/**
* Add a token attribute.
- * @param name
- * @param value
+ * @param name The attribute name
+ * @param value The attribute value
*/
void addAttribute(String name, Object value);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
index ba5d1ac..5e3ce13 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/base/KrbToken.java
@@ -115,6 +115,7 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
/**
* Get token encoder.
+ * @return The token encoder
*/
private static TokenEncoder getTokenEncoder() {
if (tokenEncoder == null) {
@@ -125,6 +126,7 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
/**
* Get token decoder.
+ * @return The token decoder
*/
private static TokenDecoder getTokenDecoder() {
if (tokenDecoder == null) {
@@ -135,6 +137,7 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
/**
* Get token format.
+ * @return The token format
*/
public TokenFormat getTokenFormat() {
Integer value = getFieldAsInteger(TOKEN_FORMAT);
@@ -143,6 +146,7 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
/**
* Set token format.
+ * @param tokenFormat The token format
*/
public void setTokenFormat(TokenFormat tokenFormat) {
setFieldAsInt(TOKEN_FORMAT, tokenFormat.getValue());
@@ -150,6 +154,7 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
/**
* Get token value.
+ * @return The token value
*/
public byte[] getTokenValue() {
return getFieldAsOctets(TOKEN_VALUE);
@@ -157,6 +162,7 @@ public class KrbToken extends KrbSequenceType implements AuthToken {
/**
* Set token value.
+ * @param tokenValue The token value
*/
public void setTokenValue(byte[] tokenValue) {
setFieldAsOctets(TOKEN_VALUE, tokenValue);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java b/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java
index bb542a0..2efbcf2 100644
--- a/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java
+++ b/kerby-kerb/kerb-identity-test/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/BackendTestBase.java
@@ -32,6 +32,7 @@ public abstract class BackendTestBase extends BackendTest {
/**
* Create and prepare an identity backend for the tests. Must override.
+ * @throws Exception e
*/
@BeforeClass
public static void setup() throws Exception {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
index 5f967cc..774ee6d 100644
--- a/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
+++ b/kerby-kerb/kerb-identity/src/main/java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractIdentityBackend.java
@@ -141,6 +141,7 @@ public abstract class AbstractIdentityBackend
/**
* Add an identity, invoked by addIdentity.
* @param principalName The principal name
+ * @return The added identity
* @throws KrbException e
*/
protected abstract KrbIdentity doGetIdentity(String principalName) throws KrbException;
@@ -168,6 +169,7 @@ public abstract class AbstractIdentityBackend
/**
* Add an identity, invoked by addIdentity, and return added identity.
* @param identity The identity to be added
+ * @return The added identity
* @throws KrbException e
*/
protected abstract KrbIdentity doAddIdentity(KrbIdentity identity) throws KrbException;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/fd7f6862/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
----------------------------------------------------------------------
diff --git a/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java b/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
index bb07a8e..30bf3ed 100644
--- a/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
+++ b/kerby-util/src/main/java/org/apache/kerby/util/IOUtil.java
@@ -62,7 +62,7 @@ public final class IOUtil {
* Read an input stream and return the content as string assuming UTF8.
* @param in The input stream
* @return The content
- * @throws IOException
+ * @throws IOException e
*/
public static String readInput(InputStream in) throws IOException {
byte[] content = readInputStream(in);
@@ -73,7 +73,7 @@ public final class IOUtil {
* Read a file and return the content as string assuming UTF8.
* @param file The file to read
* @return The content
- * @throws IOException
+ * @throws IOException e
*/
public static String readFile(File file) throws IOException {
long len = 0;
@@ -94,7 +94,7 @@ public final class IOUtil {
* Write a file with the content assuming UTF8.
* @param content The content
* @param file The file to write
- * @throws IOException
+ * @throws IOException e
*/
public static void writeFile(String content, File file) throws IOException {
FileOutputStream outputStream = new FileOutputStream(file);
[29/46] directory-kerby git commit: add JavaDoc for kerb-simplekdc
module
Posted by pl...@apache.org.
add JavaDoc for kerb-simplekdc module
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/c6a6674a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/c6a6674a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/c6a6674a
Branch: refs/heads/pkinit-support
Commit: c6a6674a6ddec410857905fb2867522fc1867332
Parents: 1de9a07
Author: yaningxu <ya...@gmail.com>
Authored: Mon Aug 24 14:39:01 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Mon Aug 24 14:39:01 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c6a6674a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
index 3e000bc..882cd01 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
@@ -42,7 +42,7 @@ public class SimpleKdcServer extends KdcServer {
/**
* Default constructor.
*
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
public SimpleKdcServer() throws KrbException {
super();
@@ -245,14 +245,14 @@ public class SimpleKdcServer extends KdcServer {
* Export the keys of the specified principal into keytab file.
* @param principal principal
* @param keytabFile keytab file
- * @throws org.apache.kerby.kerberos.kerb.KrbException
+ * @throws org.apache.kerby.kerberos.kerb.KrbException e
*/
public void exportPrincipal(String principal, File keytabFile) throws KrbException {
kadmin.exportKeytab(keytabFile, principal);
}
/**
- * @throws KrbException
+ * @throws KrbException e
*/
@Override
public void stop() throws KrbException {
[35/46] directory-kerby git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-kerby
Posted by pl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/a4825f0d
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a4825f0d
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a4825f0d
Branch: refs/heads/pkinit-support
Commit: a4825f0d716bf48bbb407fb2e2a93f3c6eaffaa0
Parents: 954dd26 61e0f0f
Author: yaningxu <ya...@gmail.com>
Authored: Tue Aug 25 09:06:57 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Tue Aug 25 09:06:57 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/asn1/Asn1InputBuffer.java | 2 +-
.../identitybackend/LdapIdentityGetHelper.java | 20 ++++++-------
.../java/org/apache/kerby/MavibotBackend.java | 2 +-
.../identitybackend/IdentityZNodeHelper.java | 2 +-
.../kerberos/kdc/identitybackend/ZKUtil.java | 24 ++++++++++-----
.../integration/test/jaas/TokenJaasKrbUtil.java | 4 +--
.../kerby/kerberos/kerb/client/KrbClient.java | 3 +-
.../kerby/kerberos/kerb/client/KrbConfig.java | 31 +++++++++++++++++---
.../kerby/kerberos/kerb/client/KrbContext.java | 6 ++++
.../kerb/client/impl/InternalKrbClient.java | 9 +++---
.../kerb/client/preauth/PreauthHandler.java | 2 ++
.../kerberos/kerb/transport/KrbTransport.java | 1 +
.../apache/kerby/kerberos/kerb/KrbRuntime.java | 2 ++
.../kerby/kerberos/kerb/provider/PkiLoader.java | 24 +++++++--------
.../kerberos/kerb/provider/TokenDecoder.java | 6 ++--
.../kerberos/kerb/provider/TokenEncoder.java | 6 ++--
.../kerby/kerberos/kerb/spec/KerberosTime.java | 15 ++++++++--
.../kerberos/kerb/spec/base/AuthToken.java | 16 +++++-----
.../kerby/kerberos/kerb/spec/base/KrbToken.java | 6 ++++
.../kerb/identity/backend/BackendTestBase.java | 1 +
.../backend/AbstractIdentityBackend.java | 2 ++
.../kerberos/kerb/server/SimpleKdcServer.java | 13 ++++----
.../provider/token/JwtTokenDecoder.java | 4 +--
.../main/java/org/apache/kerby/util/IOUtil.java | 6 ++--
24 files changed, 137 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
[43/46] directory-kerby git commit: Exclude DEPENDENCIES file from
apache-rat check
Posted by pl...@apache.org.
Exclude DEPENDENCIES file from apache-rat check
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/b571be37
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b571be37
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b571be37
Branch: refs/heads/pkinit-support
Commit: b571be3777e17edf5e47aa6f377e04c3291c6dfb
Parents: 0c90428
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sun Sep 6 16:44:34 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sun Sep 6 16:44:34 2015 +0200
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b571be37/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 306befd..075e876 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,7 @@
<!-- MAVEN_DEFAULT_EXCLUDES -->
<exclude>**/target/**/*</exclude>
<exclude>**/cobertura.ser</exclude>
+ <exclude>**/DEPENDENCIES</exclude>
<!-- ECLIPSE_DEFAULT_EXCLUDES -->
<exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>