directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject [24/26] directory-kerby git commit: Fix the check style issues.
Date Mon, 10 Aug 2015 05:16:05 GMT
Fix the check style 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/b26f031c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b26f031c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b26f031c

Branch: refs/heads/pkinit-support
Commit: b26f031c1d69b4f90bff0ad669fc0c49d31917ac
Parents: 1a1fa0e
Author: plusplusjiajia <jiajia.li@intel.com>
Authored: Mon Aug 10 09:46:59 2015 +0800
Committer: plusplusjiajia <jiajia.li@intel.com>
Committed: Mon Aug 10 09:46:59 2015 +0800

----------------------------------------------------------------------
 .../org/apache/kerby/kerberos/kdc/KerbyKdcServer.java   |  4 ++--
 .../org/apache/kerby/kerberos/tool/kinit/KinitTool.java |  4 ++--
 .../org/apache/kerby/kerberos/tool/klist/KlistTool.java |  4 ++--
 .../apache/kerby/kerberos/tool/kadmin/KadminTool.java   |  4 ++--
 .../apache/kerby/kerberos/tool/kdcinit/KdcInitTool.java | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b26f031c/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
index 9207b9f..c04c45f 100644
--- a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
+++ b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
@@ -49,8 +49,8 @@ public class KerbyKdcServer extends KdcServer {
         kadmin.checkBuiltinPrincipals();
     }
 
-    private static  final String USAGE = OSUtil.isWindows() ?
-            "Usage: bin/start-kdc.cmd" : "Usage: sh bin/start-kdc.sh"
+    private static final String USAGE = OSUtil.isWindows()
+            ? "Usage: bin/start-kdc.cmd" : "Usage: sh bin/start-kdc.sh"
             + " [conf-dir] [working-dir] \n"
             + "\tExample:\n"
             + "\t\tsh bin/start-kdc.sh conf runtime\n";

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b26f031c/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
index 6b89402..a2c5a7a 100644
--- a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
+++ b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
@@ -39,8 +39,8 @@ import java.util.Scanner;
  */
 public class KinitTool {
 
-    private static final String USAGE = OSUtil.isWindows() ?
-            "Usage: bin/kinit.cmd" : "Usage: sh bin/kinit.sh"
+    private static final String USAGE = OSUtil.isWindows()
+            ? "Usage: bin/kinit.cmd" : "Usage: sh bin/kinit.sh"
             + " [-conf conf_dir] [-V] [-l lifetime] [-s start_time]\n"
             + "\t\t[-r renewable_life] [-f | -F] [-p | -P] -n [-a | -A] [-C] [-E]\n"
             + "\t\t[-v] [-R] [-k [-i|-t keytab_file]] [-c cachename]\n"

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b26f031c/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/klist/KlistTool.java
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/klist/KlistTool.java
b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/klist/KlistTool.java
index 9725e87..6df39c9 100644
--- a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/klist/KlistTool.java
+++ b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/klist/KlistTool.java
@@ -43,8 +43,8 @@ import java.util.List;
  */
 public class KlistTool {
 
-    private static  final String USAGE = OSUtil.isWindows() ?
-            "Usage: bin/klist.cmd" : "Usage: sh bin/klist.sh"
+    private static  final String USAGE = OSUtil.isWindows()
+            ? "Usage: bin/klist.cmd" : "Usage: sh bin/klist.sh"
             + " [-e] [-V] [[-c] [-l] [-A] [-d] [-f] [-s] "
             + "[-a [-n]]] [-k [-t] [-K]] [name]\n"
             + "\t-c specifies credentials cache\n"

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b26f031c/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
----------------------------------------------------------------------
diff --git a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
index d453225..6b071ee 100644
--- a/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
+++ b/kerby-tool/kdc-tool/src/main/java/org/apache/kerby/kerberos/tool/kadmin/KadminTool.java
@@ -87,8 +87,8 @@ public class KadminTool {
             + "list_requests, lr, ?     List available requests.\n"
             + "quit, exit, q            Exit program.";
 
-    private static  final String USAGE = OSUtil.isWindows() ?
-            "Usage: bin/kadmin.cmd" : "Usage: sh bin/kadmin.sh"
+    private static  final String USAGE = OSUtil.isWindows()
+            ? "Usage: bin/kadmin.cmd" : "Usage: sh bin/kadmin.sh"
             + " [conf-dir] [-c cache_name]|[-k keytab]\n"
             + "\tExample:\n"
             + "\t\tsh bin/kadmin.sh conf -k /home/admin.keytab\n";

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b26f031c/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 c2d1e68..e34c497 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
@@ -32,8 +32,8 @@ public class KdcInitTool {
     private Kadmin kadmin;
     private static File keytabFile;
 
-    private static  final String USAGE = OSUtil.isWindows() ?
-            "Usage: bin/kdcinit.cmd" : "Usage: sh bin/kdcinit.sh"
+    private static  final String USAGE = OSUtil.isWindows()
+            ? "Usage: bin/kdcinit.cmd" : "Usage: sh bin/kdcinit.sh"
             + " [conf-dir] [output-keytab]\n"
             + "\tThis tool initializes KDC backend and should only be performed the first
time,\n"
             + "\tand the output keytab should be carefully kept to administrate/kadmin KDC
later.\nExample:\n"
@@ -44,10 +44,10 @@ public class KdcInitTool {
         try {
             kadmin.createBuiltinPrincipals();
             kadmin.exportKeytab(keytabFile, kadmin.getKadminPrincipal());
-            System.out.println("The keytab for kadmin principal " +
-                    " has been exported to the specified file " +
-                    keytabFile.getAbsolutePath() + ", please safely keep it, " +
-                    "in order to use kadmin tool later");
+            System.out.println("The keytab for kadmin principal "
+                    + " has been exported to the specified file "
+                    + keytabFile.getAbsolutePath() + ", please safely keep it, "
+                    + "in order to use kadmin tool later");
         } finally {
             kadmin.release();
         }


Mime
View raw message