From f19b78e12517db6c4dcbb1981423830ea39916b3 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] Revised committer verification to require email address

---
 src/main/java/com/gitblit/DaggerModule.java |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/gitblit/DaggerModule.java b/src/main/java/com/gitblit/DaggerModule.java
index 0cbb739..cc83694 100644
--- a/src/main/java/com/gitblit/DaggerModule.java
+++ b/src/main/java/com/gitblit/DaggerModule.java
@@ -20,8 +20,10 @@
 import org.apache.wicket.protocol.http.WebApplication;
 
 import com.gitblit.git.GitServlet;
+import com.gitblit.manager.AuthenticationManager;
 import com.gitblit.manager.FederationManager;
 import com.gitblit.manager.GitblitManager;
+import com.gitblit.manager.IAuthenticationManager;
 import com.gitblit.manager.IFederationManager;
 import com.gitblit.manager.IGitblitManager;
 import com.gitblit.manager.INotificationManager;
@@ -29,15 +31,28 @@
 import com.gitblit.manager.IRepositoryManager;
 import com.gitblit.manager.IRuntimeManager;
 import com.gitblit.manager.IServicesManager;
-import com.gitblit.manager.ISessionManager;
 import com.gitblit.manager.IUserManager;
 import com.gitblit.manager.NotificationManager;
 import com.gitblit.manager.ProjectManager;
 import com.gitblit.manager.RepositoryManager;
 import com.gitblit.manager.RuntimeManager;
 import com.gitblit.manager.ServicesManager;
-import com.gitblit.manager.SessionManager;
 import com.gitblit.manager.UserManager;
+import com.gitblit.servlet.BranchGraphServlet;
+import com.gitblit.servlet.DownloadZipFilter;
+import com.gitblit.servlet.DownloadZipServlet;
+import com.gitblit.servlet.EnforceAuthenticationFilter;
+import com.gitblit.servlet.FederationServlet;
+import com.gitblit.servlet.GitFilter;
+import com.gitblit.servlet.LogoServlet;
+import com.gitblit.servlet.PagesFilter;
+import com.gitblit.servlet.PagesServlet;
+import com.gitblit.servlet.RobotsTxtServlet;
+import com.gitblit.servlet.RpcFilter;
+import com.gitblit.servlet.RpcServlet;
+import com.gitblit.servlet.SparkleShareInviteServlet;
+import com.gitblit.servlet.SyndicationFilter;
+import com.gitblit.servlet.SyndicationServlet;
 import com.gitblit.wicket.GitBlitWebApp;
 import com.gitblit.wicket.GitblitWicketFilter;
 
@@ -59,7 +74,7 @@
 			IRuntimeManager.class,
 			INotificationManager.class,
 			IUserManager.class,
-			ISessionManager.class,
+			IAuthenticationManager.class,
 			IRepositoryManager.class,
 			IProjectManager.class,
 			IGitblitManager.class,
@@ -67,7 +82,7 @@
 			IServicesManager.class,
 
 			// the monolithic manager
-			Gitblit.class,
+			GitBlit.class,
 
 			// filters & servlets
 			GitServlet.class,
@@ -107,11 +122,11 @@
 		return new UserManager(runtimeManager);
 	}
 
-	@Provides @Singleton ISessionManager provideSessionManager(
+	@Provides @Singleton IAuthenticationManager provideAuthenticationManager(
 			IRuntimeManager runtimeManager,
 			IUserManager userManager) {
 
-		return new SessionManager(
+		return new AuthenticationManager(
 				runtimeManager,
 				userManager);
 	}
@@ -160,28 +175,28 @@
 				repositoryManager);
 	}
 
-	@Provides @Singleton Gitblit provideGitblit(
+	@Provides @Singleton GitBlit provideGitblit(
 			IRuntimeManager runtimeManager,
 			INotificationManager notificationManager,
 			IUserManager userManager,
-			ISessionManager sessionManager,
+			IAuthenticationManager authenticationManager,
 			IRepositoryManager repositoryManager,
 			IProjectManager projectManager,
 			IGitblitManager gitblitManager,
 			IFederationManager federationManager) {
 
-		return new Gitblit(
+		return new GitBlit(
 				runtimeManager,
 				notificationManager,
 				userManager,
-				sessionManager,
+				authenticationManager,
 				repositoryManager,
 				projectManager,
 				gitblitManager,
 				federationManager);
 	}
 
-	@Provides @Singleton IServicesManager provideServicesManager(Gitblit gitblit) {
+	@Provides @Singleton IServicesManager provideServicesManager(GitBlit gitblit) {
 		return new ServicesManager(gitblit);
 	}
 
@@ -189,7 +204,7 @@
 			IRuntimeManager runtimeManager,
 			INotificationManager notificationManager,
 			IUserManager userManager,
-			ISessionManager sessionManager,
+			IAuthenticationManager authenticationManager,
 			IRepositoryManager repositoryManager,
 			IProjectManager projectManager,
 			IGitblitManager gitblitManager,
@@ -199,7 +214,7 @@
 				runtimeManager,
 				notificationManager,
 				userManager,
-				sessionManager,
+				authenticationManager,
 				repositoryManager,
 				projectManager,
 				gitblitManager,

--
Gitblit v1.9.1