From 04a98505a4ab8f48aee22800fcac193d9367d0ae 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] Refactor user services and separate authentication (issue-281) --- src/test/java/com/gitblit/tests/GitblitUnitTest.java | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/java/com/gitblit/tests/GitblitUnitTest.java b/src/test/java/com/gitblit/tests/GitblitUnitTest.java index fc70e10..1885f12 100644 --- a/src/test/java/com/gitblit/tests/GitblitUnitTest.java +++ b/src/test/java/com/gitblit/tests/GitblitUnitTest.java @@ -15,7 +15,6 @@ */ package com.gitblit.tests; -import com.gitblit.GitBlit; import com.gitblit.IStoredSettings; import com.gitblit.manager.IFederationManager; import com.gitblit.manager.IGitblitManager; @@ -23,8 +22,9 @@ import com.gitblit.manager.IProjectManager; import com.gitblit.manager.IRepositoryManager; import com.gitblit.manager.IRuntimeManager; -import com.gitblit.manager.ISessionManager; +import com.gitblit.manager.IAuthenticationManager; import com.gitblit.manager.IUserManager; +import com.gitblit.servlet.GitblitContext; public class GitblitUnitTest extends org.junit.Assert { @@ -34,34 +34,34 @@ } public static IRuntimeManager runtime() { - return GitBlit.getManager(IRuntimeManager.class); + return GitblitContext.getManager(IRuntimeManager.class); } public static INotificationManager notifier() { - return GitBlit.getManager(INotificationManager.class); + return GitblitContext.getManager(INotificationManager.class); } public static IUserManager users() { - return GitBlit.getManager(IUserManager.class); + return GitblitContext.getManager(IUserManager.class); } - public static ISessionManager session() { - return GitBlit.getManager(ISessionManager.class); + public static IAuthenticationManager authentication() { + return GitblitContext.getManager(IAuthenticationManager.class); } public static IRepositoryManager repositories() { - return GitBlit.getManager(IRepositoryManager.class); + return GitblitContext.getManager(IRepositoryManager.class); } public static IProjectManager projects() { - return GitBlit.getManager(IProjectManager.class); + return GitblitContext.getManager(IProjectManager.class); } public static IFederationManager federation() { - return GitBlit.getManager(IFederationManager.class); + return GitblitContext.getManager(IFederationManager.class); } public static IGitblitManager gitblit() { - return GitBlit.getManager(IGitblitManager.class); + return GitblitContext.getManager(IGitblitManager.class); } } -- Gitblit v1.9.1