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 2018/01/30 06:53:33 UTC
directory-kerby git commit: Fix compilation failure.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 2e9a86443 -> 682362079
Fix compilation failure.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/68236207
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/68236207
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/68236207
Branch: refs/heads/trunk
Commit: 682362079fbca00e2b8569e3ef28803c00e272c4
Parents: 2e9a864
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Jan 30 14:50:08 2018 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Jan 30 14:50:08 2018 +0800
----------------------------------------------------------------------
.../org/apache/kerby/has/server/admin/LocalHadmin.java | 8 ++++----
.../org/apache/kerby/has/server/web/rest/HadminApi.java | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/68236207/has-project/has-server/src/main/java/org/apache/kerby/has/server/admin/LocalHadmin.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/main/java/org/apache/kerby/has/server/admin/LocalHadmin.java b/has-project/has-server/src/main/java/org/apache/kerby/has/server/admin/LocalHadmin.java
index 4661d87..8f32eeb 100644
--- a/has-project/has-server/src/main/java/org/apache/kerby/has/server/admin/LocalHadmin.java
+++ b/has-project/has-server/src/main/java/org/apache/kerby/has/server/admin/LocalHadmin.java
@@ -36,13 +36,13 @@ import org.slf4j.LoggerFactory;
import java.io.File;
-public class LocalHasAdmin implements Hadmin {
- public static final Logger LOG = LoggerFactory.getLogger(LocalHasAdmin.class);
+public class LocalHadmin implements Hadmin {
+ public static final Logger LOG = LoggerFactory.getLogger(LocalHadmin.class);
private final ServerSetting serverSetting;
private LocalKadmin kadmin;
- public LocalHasAdmin(HasServer hasServer) throws KrbException {
+ public LocalHadmin(HasServer hasServer) throws KrbException {
if (hasServer.getKdcServer() == null) {
throw new RuntimeException("Could not get HAS KDC server, please start KDC first.");
}
@@ -57,7 +57,7 @@ public class LocalHasAdmin implements Hadmin {
* @param confDir The path of conf dir
* @throws KrbException e
*/
- public LocalHasAdmin(File confDir) throws KrbException {
+ public LocalHadmin(File confDir) throws KrbException {
KdcConfig tmpKdcConfig = KdcUtil.getKdcConfig(confDir);
if (tmpKdcConfig == null) {
tmpKdcConfig = new KdcConfig();
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/68236207/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/HadminApi.java
----------------------------------------------------------------------
diff --git a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/HadminApi.java b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/HadminApi.java
index c769645..a7febc1 100644
--- a/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/HadminApi.java
+++ b/has-project/has-server/src/main/java/org/apache/kerby/has/server/web/rest/HadminApi.java
@@ -19,7 +19,7 @@ package org.apache.kerby.has.server.web.rest;
import org.apache.kerby.has.common.HasException;
import org.apache.kerby.has.server.HasServer;
-import org.apache.kerby.has.server.admin.LocalHasAdmin;
+import org.apache.kerby.has.server.admin.LocalHadmin;
import org.apache.kerby.has.server.web.HostRoleType;
import org.apache.kerby.has.server.web.WebServer;
import org.apache.kerby.has.server.web.rest.param.HostParam;
@@ -88,9 +88,9 @@ public class HadminApi {
@Produces(MediaType.APPLICATION_JSON)
public Response addprincipalsbyrole(@Context HttpServletRequest request) {
if (httpRequest.isSecure()) {
- LocalHasAdmin hasAdmin = null;
+ LocalHadmin hasAdmin = null;
try {
- hasAdmin = new LocalHasAdmin(WebServer.getHasServerFromContext(context));
+ hasAdmin = new LocalHadmin(WebServer.getHasServerFromContext(context));
} catch (KrbException e) {
WebServer.LOG.info("Failed to create local hadmin." + e.getMessage());
}
@@ -139,11 +139,11 @@ public class HadminApi {
if (httpRequest.isSecure()) {
WebServer.LOG.info("Request to export keytabs.");
String msg;
- LocalHasAdmin hasAdmin;
+ LocalHadmin hasAdmin;
HasServer hasServer;
try {
hasServer = WebServer.getHasServerFromContext(context);
- hasAdmin = new LocalHasAdmin(hasServer);
+ hasAdmin = new LocalHadmin(hasServer);
} catch (KrbException e) {
msg = "Failed to create local hadmin." + e.getMessage();
WebServer.LOG.error(msg);