summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/servlet/GitblitContext.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-17 21:30:46 -0400
committerJames Moger <james.moger@gitblit.com>2014-04-10 18:58:09 -0400
commit245836904ba5cecdc31773cf7c9616396c8ad8c0 (patch)
treec7da9a20350ed911421647ccb1519728081f1c19 /src/main/java/com/gitblit/servlet/GitblitContext.java
parent9d44ade215922fd9e7bda7c604b31c31d217d750 (diff)
downloadgitblit-245836904ba5cecdc31773cf7c9616396c8ad8c0.tar.gz
gitblit-245836904ba5cecdc31773cf7c9616396c8ad8c0.zip
Elevate the public key manager to a top-level manager
Diffstat (limited to 'src/main/java/com/gitblit/servlet/GitblitContext.java')
-rw-r--r--src/main/java/com/gitblit/servlet/GitblitContext.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/servlet/GitblitContext.java b/src/main/java/com/gitblit/servlet/GitblitContext.java
index d4ec9671..cf8bba01 100644
--- a/src/main/java/com/gitblit/servlet/GitblitContext.java
+++ b/src/main/java/com/gitblit/servlet/GitblitContext.java
@@ -47,6 +47,7 @@ import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.IUserManager;
+import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.utils.ContainerUtils;
import com.gitblit.utils.StringUtils;
@@ -149,7 +150,7 @@ public class GitblitContext extends DaggerContext {
String contextRealPath = context.getRealPath("/");
File contextFolder = (contextRealPath != null) ? new File(contextRealPath) : null;
- // if the base folder dosen't match the default assume they don't want to use express,
+ // if the base folder dosen't match the default assume they don't want to use express,
// this allows for other containers to customise the basefolder per context.
String defaultBase = Constants.contextFolder$ + "/WEB-INF/data";
String base = lookupBaseFolderFromJndi();
@@ -178,6 +179,7 @@ public class GitblitContext extends DaggerContext {
startManager(injector, INotificationManager.class);
startManager(injector, IUserManager.class);
startManager(injector, IAuthenticationManager.class);
+ startManager(injector, IPublicKeyManager.class);
startManager(injector, IRepositoryManager.class);
startManager(injector, IProjectManager.class);
startManager(injector, IFederationManager.class);