You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/07/26 21:36:56 UTC
[1/3] directory-kerby git commit: Improved test by declaring expected
exception.
Repository: directory-kerby
Updated Branches:
refs/heads/master 5a3040ee1 -> a16b9336d
Improved test by declaring expected exception.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/3f41d932
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/3f41d932
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/3f41d932
Branch: refs/heads/master
Commit: 3f41d932282d3a8d0f06ac14622af901b5f90d10
Parents: 5a3040e
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sun Jul 26 20:53:07 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sun Jul 26 20:53:07 2015 +0200
----------------------------------------------------------------------
.../TokenLoginTestWithTokenPreauthDisabled.java | 22 +++++++-------------
1 file changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/3f41d932/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestWithTokenPreauthDisabled.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestWithTokenPreauthDisabled.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestWithTokenPreauthDisabled.java
index 857d6f2..1dd8417 100644
--- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestWithTokenPreauthDisabled.java
+++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/TokenLoginTestWithTokenPreauthDisabled.java
@@ -19,6 +19,8 @@
*/
package org.apache.kerby.kerberos.kerb.integration.test;
+import javax.security.auth.login.LoginException;
+
import org.junit.Assert;
import org.junit.Test;
@@ -32,23 +34,15 @@ public class TokenLoginTestWithTokenPreauthDisabled extends TokenLoginTestBase {
return false;
}
- @Test
+ @Test(expected = LoginException.class)
public void testLoginWithTokenStr() throws Exception {
- try {
- super.testLoginWithTokenStr();
- Assert.fail("Exception should have been thrown");
- } catch (Exception e) {
- //expects exception
- }
+ super.testLoginWithTokenStr();
+ Assert.fail("Exception should have been thrown");
}
- @Test
+ @Test(expected = LoginException.class)
public void testLoginWithTokenCache() throws Exception {
- try {
- super.testLoginWithTokenCache();
- Assert.fail("Exception should have been thrown");
- } catch (Exception e) {
- //expects exception
- }
+ super.testLoginWithTokenCache();
+ Assert.fail("Exception should have been thrown");
}
}
\ No newline at end of file
[2/3] directory-kerby git commit: Fix checkstyle violations
Posted by se...@apache.org.
Fix checkstyle violations
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/b5d3809e
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b5d3809e
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b5d3809e
Branch: refs/heads/master
Commit: b5d3809ed266aadc7cadf17188f5d4d6a57d33b9
Parents: 3f41d93
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sun Jul 26 21:35:21 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sun Jul 26 21:35:21 2015 +0200
----------------------------------------------------------------------
.../kerby/benchmark/KrbCodecBenchmark.java | 6 +++++-
.../identitybackend/JsonIdentityBackend.java | 11 ++++-------
.../identitybackend/LdapIdentityBackend.java | 2 +-
.../test/jaas/TokenAuthLoginModule.java | 2 +-
.../kerb/integration/test/jaas/TokenCache.java | 7 ++++++-
.../kerby/kerberos/kerb/admin/Kadmin.java | 2 +-
.../kerb/client/request/TgsRequest.java | 2 +-
.../kerby/kerberos/kerb/server/KdcHandler.java | 2 +-
.../kerb/server/preauth/token/TokenPreauth.java | 2 +-
.../kerb/server/request/TickertIssuer.java | 3 ++-
.../kerby/kerberos/kerb/client/JaasKrbUtil.java | 8 ++++----
.../kerby/kerberos/kerb/client/Krb5Conf.java | 4 ++--
.../kerberos/kerb/ccache/CredentialCache.java | 5 ++---
.../kerberos/tool/kdcinit/KdcInitTool.java | 20 ++++++++++----------
14 files changed, 41 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
----------------------------------------------------------------------
diff --git a/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java b/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
index 4d1decd..811713b 100644
--- a/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
+++ b/benchmark/src/main/java/org/apache/kerby/benchmark/KrbCodecBenchmark.java
@@ -22,7 +22,11 @@ package org.apache.kerby.benchmark;
import org.apache.directory.api.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.kerberos.codec.apReq.ApReqContainer;
import org.apache.kerby.kerberos.kerb.spec.ap.ApReq;
-import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
import java.io.IOException;
import java.io.InputStream;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/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 c45e4ae..84b1830 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
@@ -155,8 +155,7 @@ public class JsonIdentityBackend extends AbstractIdentityBackend {
String principalName = identity.getPrincipalName();
if (ids.containsKey(principalName)) {
- LOG.error("Error occurred while adding identity, principal " + principalName +
- " already exists.");
+ LOG.error("Error occurred while adding identity, principal " + principalName + " already exists.");
throw new RuntimeException("Principal already exists.");
}
@@ -176,8 +175,7 @@ public class JsonIdentityBackend extends AbstractIdentityBackend {
if (ids.containsKey(principalName)) {
ids.put(principalName, identity);
} else {
- LOG.error("Error occurred while updating identity, principal " + principalName +
- " does not exists.");
+ LOG.error("Error occurred while updating identity, principal " + principalName + " does not exists.");
throw new RuntimeException("Principal does not exist.");
}
idsToFile(ids);
@@ -193,8 +191,7 @@ public class JsonIdentityBackend extends AbstractIdentityBackend {
if (ids.containsKey(principalName)) {
ids.remove(principalName);
} else {
- LOG.error("Error occurred while deleting identity, principal " + principalName +
- " does not exists.");
+ LOG.error("Error occurred while deleting identity, principal " + principalName + " does not exists.");
throw new RuntimeException("Principal does not exist.");
}
idsToFile(ids);
@@ -233,7 +230,7 @@ public class JsonIdentityBackend extends AbstractIdentityBackend {
try {
IOUtil.writeFile(newFileJson, jsonKdbFile);
} catch (IOException e) {
- LOG.error("Error occurred while writing ids to file: " + jsonKdbFile );
+ LOG.error("Error occurred while writing ids to file: " + jsonKdbFile);
throw new RuntimeException("Failed to write file", e);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
----------------------------------------------------------------------
diff --git a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
index 2cfe374..27ccc40 100644
--- a/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
+++ b/kerby-backend/ldap-backend/src/main/java/org/apache/kerby/kerberos/kdc/identitybackend/LdapIdentityBackend.java
@@ -296,7 +296,7 @@ public class LdapIdentityBackend extends AbstractIdentityBackend {
Dn dn = toDn(principalName);
connection.delete(dn);
} catch (LdapException e) {
- LOG.error("Error occurred while deleting identity: " + principalName );
+ LOG.error("Error occurred while deleting identity: " + principalName);
throw new KrbException("Failed to remove identity", e);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java
index 0470a21..65ad133 100644
--- a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java
+++ b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenAuthLoginModule.java
@@ -81,7 +81,7 @@ public class TokenAuthLoginModule implements LoginModule {
this.subject = subject;
/** initialize any configured options*/
- princName = (String)options.get(PRINCIPAL);
+ princName = (String) options.get(PRINCIPAL);
tokenStr = (String) options.get(TOKEN);
tokenCacheName = (String) options.get(TOKEN_CACHE);
armorCache = new File((String) options.get(ARMOR_CACHE));
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenCache.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenCache.java b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenCache.java
index 010793c..6051cdb 100644
--- a/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenCache.java
+++ b/kerby-kerb/integration-test/src/main/java/org/apache/kerby/kerberos/kerb/integration/test/jaas/TokenCache.java
@@ -23,7 +23,12 @@ package org.apache.kerby.kerberos.kerb.integration.test.jaas;
import org.apache.commons.io.output.FileWriterWithEncoding;
import org.apache.kerby.kerberos.kerb.KrbException;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Writer;
import java.nio.charset.Charset;
/**
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/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 eeafdc4..88cbe1c 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
@@ -83,7 +83,7 @@ public class Kadmin {
public void checkBuiltinPrincipals() throws KrbException {
String tgsPrincipal = getTgsPrincipal();
String kadminPrincipal = getKadminPrincipal();
- if (backend.getIdentity(tgsPrincipal) == null || backend.getIdentity(kadminPrincipal) == null ) {
+ if (backend.getIdentity(tgsPrincipal) == null || backend.getIdentity(kadminPrincipal) == null) {
throw new KrbException("The builtin principals do not exist in backend, please run the kdcinit tool.");
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/TgsRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/TgsRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/TgsRequest.java
index bb4ee88..d291e99 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/TgsRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/TgsRequest.java
@@ -59,7 +59,7 @@ public class TgsRequest extends KdcRequest {
@Override
public void process() throws KrbException {
String serverPrincipal = getKrbOptions().getStringOption(KrbOption.SERVER_PRINCIPAL);
- if(serverPrincipal == null) {
+ if (serverPrincipal == null) {
LOG.warn("Server principal is null.");
}
setServerPrincipal(new PrincipalName(serverPrincipal));
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/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 0e51c94..2509619 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
@@ -79,7 +79,7 @@ public class KdcHandler {
} else if (messageType == KrbMessageType.AS_REQ) {
kdcRequest = new AsRequest((AsReq) kdcReq, kdcContext);
} else {
- LOG.error("Invalid message type: "+ messageType);
+ LOG.error("Invalid message type: " + messageType);
throw new KrbException(KrbErrorCode.KRB_AP_ERR_MSG_TYPE);
}
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
index 969b8d2..ba7cbec 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/preauth/token/TokenPreauth.java
@@ -53,7 +53,7 @@ public class TokenPreauth extends AbstractPreauthPlugin {
public boolean verify(KdcRequest kdcRequest, PluginRequestContext requestContext,
PaDataEntry paData) throws KrbException {
- if(!kdcRequest.getKdcContext().getConfig().isAllowTokenPreauth()) {
+ if (!kdcRequest.getKdcContext().getConfig().isAllowTokenPreauth()) {
throw new KrbException("Token preauth is not allowed.");
}
if (paData.getPaDataType() == PaDataType.TOKEN_REQUEST) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TickertIssuer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TickertIssuer.java b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TickertIssuer.java
index bc7616e..37403d7 100644
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TickertIssuer.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/request/TickertIssuer.java
@@ -186,7 +186,8 @@ public abstract class TickertIssuer {
krbRtime = KerberosTime.NEVER;
}
KerberosTime allowedMaximumRenewableTime = krbStartTime;
- allowedMaximumRenewableTime = allowedMaximumRenewableTime.extend(config.getMaximumRenewableLifetime() * 1000);
+ allowedMaximumRenewableTime = allowedMaximumRenewableTime
+ .extend(config.getMaximumRenewableLifetime() * 1000);
if (krbRtime.greaterThan(allowedMaximumRenewableTime)) {
krbRtime = allowedMaximumRenewableTime;
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
index 36dd40c..c03a98e 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/JaasKrbUtil.java
@@ -42,7 +42,7 @@ import java.util.Set;
*/
public final class JaasKrbUtil {
- public final static boolean enableDebug = true;
+ public static final boolean ENABLE_DEBUG = true;
private JaasKrbUtil() { }
@@ -131,7 +131,7 @@ public final class JaasKrbUtil {
options.put("renewTGT", "false");
options.put("refreshKrb5Config", "true");
options.put("isInitiator", "false");
- options.put("debug", String.valueOf(enableDebug));
+ options.put("debug", String.valueOf(ENABLE_DEBUG));
return new AppConfigurationEntry[]{
new AppConfigurationEntry(getKrb5LoginModuleName(),
@@ -160,7 +160,7 @@ public final class JaasKrbUtil {
options.put("refreshKrb5Config", "true");
options.put("isInitiator", "true");
options.put("ticketCache", clientCredentialFile.getAbsolutePath());
- options.put("debug", String.valueOf(enableDebug));
+ options.put("debug", String.valueOf(ENABLE_DEBUG));
return new AppConfigurationEntry[]{
new AppConfigurationEntry(getKrb5LoginModuleName(),
@@ -186,7 +186,7 @@ public final class JaasKrbUtil {
options.put("renewTGT", "true");
options.put("refreshKrb5Config", "true");
options.put("isInitiator", "true");
- options.put("debug", String.valueOf(enableDebug));
+ options.put("debug", String.valueOf(ENABLE_DEBUG));
return new AppConfigurationEntry[]{
new AppConfigurationEntry(getKrb5LoginModuleName(),
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
index ab9c8c9..5768b9b 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/client/Krb5Conf.java
@@ -42,10 +42,10 @@ public class Krb5Conf {
content = content.replaceAll("_KDC_PORT_",
String.valueOf(kdcPort));
- if(setting.allowTcp()) {
+ if (setting.allowTcp()) {
content = content.replaceAll("#_KDC_TCP_PORT_", "kdc_tcp_port = " + setting.getKdcTcpPort());
}
- if(setting.allowUdp()) {
+ if (setting.allowUdp()) {
content = content.replaceAll("#_KDC_UDP_PORT_", "kdc_udp_port = " + setting.getKdcUdpPort());
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredentialCache.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredentialCache.java b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredentialCache.java
index 2a312d6..6971788 100644
--- a/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredentialCache.java
+++ b/kerby-kerb/kerb-util/src/main/java/org/apache/kerby/kerberos/kerb/ccache/CredentialCache.java
@@ -253,11 +253,10 @@ public class CredentialCache implements KrbCredentialCache {
usec = ccis.readInt();
tags.add(new Tag(tag, time, usec));
break;
- default: {
- if (ccis.read(new byte[tagLen], 0, tagLen) == -1) { // ignore unknown tag
+ default:
+ if (ccis.read(new byte[tagLen], 0, tagLen) == -1) { // ignore unknown tag
throw new IOException();
}
- }
}
len = len - (4 + tagLen);
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5d3809e/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
----------------------------------------------------------------------
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
index 06b3830..ca3c201 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java
@@ -28,18 +28,18 @@ public class KdcInitTool {
private Kadmin kadmin;
private static File keytabFile;
- private static final String USAGE = "Usage: " +
- KdcInitTool.class.getSimpleName() +
- " conf-dir keytab";
+ private static final String USAGE = "Usage: "
+ + KdcInitTool.class.getSimpleName()
+ + " conf-dir keytab";
private void init(File confDir) throws KrbException {
kadmin = new Kadmin(confDir);
kadmin.createBuiltinPrincipals();
kadmin.exportKeytab(keytabFile, kadmin.getKadminPrincipal());
- System.out.println("The kadmin principal " + kadmin.getKadminPrincipal() +
- " has exported into keytab file " + keytabFile.getAbsolutePath() +
- ", please make sure to keep it, because it will be used by kadmin tool" +
- " for the authentication.");
+ System.out.println("The kadmin principal " + kadmin.getKadminPrincipal()
+ + " has exported into keytab file " + keytabFile.getAbsolutePath()
+ + ", please make sure to keep it, because it will be used by kadmin tool"
+ + " for the authentication.");
}
public static void main(String[] args) throws KrbException {
@@ -63,9 +63,9 @@ public class KdcInitTool {
}
if (keytabFile.exists()) {
- System.err.println("There is one kadmin keytab exists in " + keyTabPath +
- ", this tool maybe have been executed, if not," +
- " please delete it or change the keytab-dir.");
+ System.err.println("There is one kadmin keytab exists in " + keyTabPath
+ + ", this tool maybe have been executed, if not,"
+ + " please delete it or change the keytab-dir.");
return;
}
[3/3] directory-kerby git commit: Re-enable checkstyle checks.
Configure Eclipse m2e.
Posted by se...@apache.org.
Re-enable checkstyle checks. Configure Eclipse m2e.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/a16b9336
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a16b9336
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a16b9336
Branch: refs/heads/master
Commit: a16b9336d14a9b2099edef3da6f6f8ab0115c734
Parents: b5d3809
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
Authored: Sun Jul 26 21:36:13 2015 +0200
Committer: Stefan Seelmann <ma...@stefan-seelmann.de>
Committed: Sun Jul 26 21:36:13 2015 +0200
----------------------------------------------------------------------
pom.xml | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 58 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a16b9336/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1ef5bc8..c1d9cc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,10 +219,65 @@
<configLocation>${checkstyle.dir}/kerby-checkstyle.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<encoding>UTF-8</encoding>
- <failOnViolation>false</failOnViolation>
+ <failOnViolation>true</failOnViolation>
</configuration>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-pmd-plugin
+ </artifactId>
+ <versionRange>[3.4,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-checkstyle-plugin
+ </artifactId>
+ <versionRange>[2.15,)</versionRange>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -275,7 +330,7 @@
</properties>
</profile>
<profile>
- <id>activate-in-module</id>
+ <id>activate-checkstyle-in-module</id>
<activation>
<file>
<exists>${basedir}/../docs/kerby-checkstyle.xml</exists>
@@ -286,7 +341,7 @@
</properties>
</profile>
<profile>
- <id>activate-in-submodule</id>
+ <id>activate-checkstyle-in-submodule</id>
<activation>
<file>
<exists>${basedir}/../../docs/kerby-checkstyle.xml</exists>