From aa6d43e8b28ff73d69a920e9b3a7b284cfce00c3 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] Extract SessionManager from GitBlit singleton

---
 src/main/java/com/gitblit/IUserService.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gitblit/IUserService.java b/src/main/java/com/gitblit/IUserService.java
index 628c165..316e4a5 100644
--- a/src/main/java/com/gitblit/IUserService.java
+++ b/src/main/java/com/gitblit/IUserService.java
@@ -18,6 +18,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.gitblit.Constants.AccountType;
+import com.gitblit.manager.IRuntimeManager;
 import com.gitblit.models.TeamModel;
 import com.gitblit.models.UserModel;
 
@@ -35,10 +37,10 @@
 	 * retrieve settings from gitblit.properties or the web.xml file without
 	 * relying on the GitBlit static singleton.
 	 *
-	 * @param settings
-	 * @since 0.7.0
+	 * @param runtimeManager
+	 * @since 1.4.0
 	 */
-	void setup(IStoredSettings settings);
+	void setup(IRuntimeManager runtimeManager);
 
 	/**
 	 * Does the user service support changes to credentials?
@@ -204,7 +206,7 @@
 	 * @return list of all usernames that can bypass the access restriction
 	 * @since 0.8.0
 	 */
-	List<String> getTeamnamesForRepositoryRole(String role);
+	List<String> getTeamNamesForRepositoryRole(String role);
 
 	/**
 	 * Sets the list of all teams who are allowed to bypass the access
@@ -318,6 +320,14 @@
 	boolean deleteRepositoryRole(String role);
 
 	/**
+	 * Returns the account type for the user models.
+	 *
+	 * @return the account type
+	 * @since 1.4.0
+	 */
+	AccountType getAccountType();
+
+	/**
 	 * @See java.lang.Object.toString();
 	 * @return string representation of the login service
 	 */

--
Gitblit v1.9.1