From b6976fc0a4b1fd07e1e72fdd06597a0ffb9d48ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 02 Dec 2013 15:51:59 -0500
Subject: [PATCH] Merge "Bump bouncycastle version to 1.49"

---
 src/main/java/com/gitblit/servlet/GitblitContext.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index a86ecf6..ca9a67c 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -43,13 +43,12 @@
 import com.gitblit.git.GitServlet;
 import com.gitblit.manager.IAuthenticationManager;
 import com.gitblit.manager.IFederationManager;
-import com.gitblit.manager.IGitblitManager;
+import com.gitblit.manager.IGitblit;
 import com.gitblit.manager.IManager;
 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.utils.ContainerUtils;
 import com.gitblit.utils.StringUtils;
@@ -173,9 +172,8 @@
 		startManager(injector, IAuthenticationManager.class);
 		startManager(injector, IRepositoryManager.class);
 		startManager(injector, IProjectManager.class);
-		startManager(injector, IGitblitManager.class);
 		startManager(injector, IFederationManager.class);
-		startManager(injector, IServicesManager.class);
+		startManager(injector, IGitblit.class);
 
 		logger.info("");
 		logger.info("All managers started.");

--
Gitblit v1.9.1