From cc47aad618137ee6481c8bc164d8074bd30fde9e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 10 Dec 2013 11:04:46 -0500
Subject: [PATCH] Remove @Inject references because they confuse JEE containers

---
 src/main/java/com/gitblit/DaggerModule.java |  182 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 149 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/gitblit/DaggerModule.java b/src/main/java/com/gitblit/DaggerModule.java
index cc83694..b12510c 100644
--- a/src/main/java/com/gitblit/DaggerModule.java
+++ b/src/main/java/com/gitblit/DaggerModule.java
@@ -17,26 +17,21 @@
 
 import javax.inject.Singleton;
 
-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.IGitblit;
 import com.gitblit.manager.INotificationManager;
 import com.gitblit.manager.IProjectManager;
 import com.gitblit.manager.IRepositoryManager;
 import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.IServicesManager;
 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.UserManager;
 import com.gitblit.servlet.BranchGraphServlet;
 import com.gitblit.servlet.DownloadZipFilter;
@@ -77,12 +72,10 @@
 			IAuthenticationManager.class,
 			IRepositoryManager.class,
 			IProjectManager.class,
-			IGitblitManager.class,
 			IFederationManager.class,
-			IServicesManager.class,
 
 			// the monolithic manager
-			GitBlit.class,
+			IGitblit.class,
 
 			// filters & servlets
 			GitServlet.class,
@@ -154,35 +147,21 @@
 	@Provides @Singleton IFederationManager provideFederationManager(
 			IRuntimeManager runtimeManager,
 			INotificationManager notificationManager,
-			IUserManager userManager,
 			IRepositoryManager repositoryManager) {
 
 		return new FederationManager(
 				runtimeManager,
 				notificationManager,
-				userManager,
 				repositoryManager);
 	}
 
-	@Provides @Singleton IGitblitManager provideGitblitManager(
-			IRuntimeManager runtimeManager,
-			IUserManager userManager,
-			IRepositoryManager repositoryManager) {
-
-		return new GitblitManager(
-				runtimeManager,
-				userManager,
-				repositoryManager);
-	}
-
-	@Provides @Singleton GitBlit provideGitblit(
+	@Provides @Singleton IGitblit provideGitblit(
 			IRuntimeManager runtimeManager,
 			INotificationManager notificationManager,
 			IUserManager userManager,
 			IAuthenticationManager authenticationManager,
 			IRepositoryManager repositoryManager,
 			IProjectManager projectManager,
-			IGitblitManager gitblitManager,
 			IFederationManager federationManager) {
 
 		return new GitBlit(
@@ -192,23 +171,18 @@
 				authenticationManager,
 				repositoryManager,
 				projectManager,
-				gitblitManager,
 				federationManager);
 	}
 
-	@Provides @Singleton IServicesManager provideServicesManager(GitBlit gitblit) {
-		return new ServicesManager(gitblit);
-	}
-
-	@Provides @Singleton WebApplication provideWebApplication(
+	@Provides @Singleton GitBlitWebApp provideWebApplication(
 			IRuntimeManager runtimeManager,
 			INotificationManager notificationManager,
 			IUserManager userManager,
 			IAuthenticationManager authenticationManager,
 			IRepositoryManager repositoryManager,
 			IProjectManager projectManager,
-			IGitblitManager gitblitManager,
-			IFederationManager federationManager) {
+			IFederationManager federationManager,
+			IGitblit gitblit) {
 
 		return new GitBlitWebApp(
 				runtimeManager,
@@ -217,7 +191,149 @@
 				authenticationManager,
 				repositoryManager,
 				projectManager,
-				gitblitManager,
+				federationManager,
+				gitblit);
+	}
+
+	@Provides @Singleton GitblitWicketFilter provideGitblitWicketFilter(GitBlitWebApp webapp) {
+		return new GitblitWicketFilter(webapp);
+	}
+
+	@Provides GitServlet provideGitServlet(IGitblit gitblit) {
+		return new GitServlet(gitblit);
+	}
+
+	@Provides GitFilter provideGitFilter(
+			IRuntimeManager runtimeManager,
+			IUserManager userManager,
+			IAuthenticationManager authenticationManager,
+			IRepositoryManager repositoryManager,
+			IFederationManager federationManager) {
+
+		return new GitFilter(
+				runtimeManager,
+				userManager,
+				authenticationManager,
+				repositoryManager,
 				federationManager);
 	}
+
+	@Provides @Singleton PagesServlet providePagesServlet(
+			IRuntimeManager runtimeManager,
+			IRepositoryManager repositoryManager) {
+
+		return new PagesServlet(runtimeManager, repositoryManager);
+	}
+
+	@Provides @Singleton PagesFilter providePagesFilter(
+			IRuntimeManager runtimeManager,
+			IAuthenticationManager authenticationManager,
+			IRepositoryManager repositoryManager) {
+
+		return new PagesFilter(
+				runtimeManager,
+				authenticationManager,
+				repositoryManager);
+	}
+
+	@Provides @Singleton RpcServlet provideRpcServlet(IGitblit gitblit) {
+		return new RpcServlet(gitblit);
+	}
+
+	@Provides @Singleton RpcFilter provideRpcFilter(
+			IRuntimeManager runtimeManager,
+			IAuthenticationManager authenticationManager) {
+
+		return new RpcFilter(runtimeManager, authenticationManager);
+	}
+
+	@Provides @Singleton DownloadZipServlet provideDownloadZipServlet(
+			IRuntimeManager runtimeManager,
+			IRepositoryManager repositoryManager) {
+
+		return new DownloadZipServlet(runtimeManager, repositoryManager);
+	}
+
+	@Provides @Singleton DownloadZipFilter provideDownloadZipFilter(
+			IRuntimeManager runtimeManager,
+			IAuthenticationManager authenticationManager,
+			IRepositoryManager repositoryManager) {
+
+		return new DownloadZipFilter(
+				runtimeManager,
+				authenticationManager,
+				repositoryManager);
+	}
+
+	@Provides @Singleton SyndicationServlet provideSyndicationServlet(
+			IRuntimeManager runtimeManager,
+			IRepositoryManager repositoryManager,
+			IProjectManager projectManager) {
+
+		return new SyndicationServlet(
+				runtimeManager,
+				repositoryManager,
+				projectManager);
+	}
+
+	@Provides @Singleton SyndicationFilter provideSyndicationFilter(
+			IRuntimeManager runtimeManager,
+			IAuthenticationManager authenticationManager,
+			IRepositoryManager repositoryManager,
+			IProjectManager projectManager) {
+
+		return new SyndicationFilter(
+				runtimeManager,
+				authenticationManager,
+				repositoryManager,
+				projectManager);
+	}
+
+	@Provides @Singleton FederationServlet provideFederationServlet(
+			IRuntimeManager runtimeManager,
+			IUserManager userManager,
+			IRepositoryManager repositoryManager,
+			IFederationManager federationManager) {
+
+		return new FederationServlet(
+				runtimeManager,
+				userManager,
+				repositoryManager,
+				federationManager);
+	}
+
+	@Provides @Singleton SparkleShareInviteServlet provideSparkleshareInviteServlet(
+			IRuntimeManager runtimeManager,
+			IUserManager userManager,
+			IAuthenticationManager authenticationManager,
+			IRepositoryManager repositoryManager) {
+
+		return new SparkleShareInviteServlet(
+				runtimeManager,
+				userManager,
+				authenticationManager,
+				repositoryManager);
+	}
+
+	@Provides @Singleton BranchGraphServlet provideBranchGraphServlet(
+			IRuntimeManager runtimeManager,
+			IRepositoryManager repositoryManager) {
+
+		return new BranchGraphServlet(runtimeManager, repositoryManager);
+	}
+
+	@Provides @Singleton RobotsTxtServlet provideRobotsTxtServlet(IRuntimeManager runtimeManager) {
+		return new RobotsTxtServlet(runtimeManager);
+	}
+
+	@Provides @Singleton LogoServlet provideLogoServlet(IRuntimeManager runtimeManager) {
+		return new LogoServlet(runtimeManager);
+	}
+
+	@Provides @Singleton EnforceAuthenticationFilter provideEnforceAuthenticationFilter(
+			IRuntimeManager runtimeManager,
+			IAuthenticationManager authenticationManager) {
+
+		return new EnforceAuthenticationFilter(runtimeManager, authenticationManager);
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1