diff options
author | James Moger <james.moger@gitblit.com> | 2014-04-11 12:51:50 -0600 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-04-11 12:51:50 -0600 |
commit | 436bd3f0ecdee282c503a9eb0f7a240b7a68ff49 (patch) | |
tree | 555f9fb8bf77d1dfc6f0e9f8783fa17822b18b05 /src/main/java/com/gitblit/servlet/GitblitContext.java | |
parent | 1f4cc634ec72934d5f71131e91cf0ff8cdf7d9e5 (diff) | |
parent | df3594165089d28409cdd57bbe5f3fde304557f1 (diff) | |
download | gitblit-436bd3f0ecdee282c503a9eb0f7a240b7a68ff49.tar.gz gitblit-436bd3f0ecdee282c503a9eb0f7a240b7a68ff49.zip |
Merged #6 "Support serving repositories over the SSH transport"
Diffstat (limited to 'src/main/java/com/gitblit/servlet/GitblitContext.java')
-rw-r--r-- | src/main/java/com/gitblit/servlet/GitblitContext.java | 6 |
1 files changed, 5 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..553651da 100644 --- a/src/main/java/com/gitblit/servlet/GitblitContext.java +++ b/src/main/java/com/gitblit/servlet/GitblitContext.java @@ -43,10 +43,12 @@ import com.gitblit.manager.IFederationManager; import com.gitblit.manager.IGitblit; import com.gitblit.manager.IManager; import com.gitblit.manager.INotificationManager; +import com.gitblit.manager.IPluginManager; 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 +151,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(); @@ -175,9 +177,11 @@ public class GitblitContext extends DaggerContext { managers.add(runtime); // start all other managers + startManager(injector, IPluginManager.class); 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); |