From 7bf6e183ff8abd0c35eeb29f399da12389562ecb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Moved servlets and services to separate packages
---
src/main/java/com/gitblit/GitblitUserService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/GitblitUserService.java b/src/main/java/com/gitblit/GitblitUserService.java
index ba4c9c5..715aed9 100644
--- a/src/main/java/com/gitblit/GitblitUserService.java
+++ b/src/main/java/com/gitblit/GitblitUserService.java
@@ -59,8 +59,7 @@
}
@Override
- public void setup(IStoredSettings settings) {
- IRuntimeManager runtimeManager = GitBlit.getManager(IRuntimeManager.class);
+ public void setup(IRuntimeManager runtimeManager) {
File realmFile = runtimeManager.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf");
serviceImpl = createUserService(realmFile);
logger.info("GUS delegating to " + serviceImpl.toString());
@@ -127,6 +126,12 @@
return serviceImpl.getCookie(model);
}
+ /**
+ * Authenticate a user based on their cookie.
+ *
+ * @param cookie
+ * @return a user object or null
+ */
@Override
public UserModel authenticate(char[] cookie) {
UserModel user = serviceImpl.authenticate(cookie);
@@ -227,8 +232,8 @@
}
@Override
- public List<String> getTeamnamesForRepositoryRole(String role) {
- return serviceImpl.getTeamnamesForRepositoryRole(role);
+ public List<String> getTeamNamesForRepositoryRole(String role) {
+ return serviceImpl.getTeamNamesForRepositoryRole(role);
}
@Override
@@ -313,7 +318,8 @@
}
}
- protected AccountType getAccountType() {
+ @Override
+ public AccountType getAccountType() {
return AccountType.LOCAL;
}
}
--
Gitblit v1.9.1