From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java b/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
index 8a871eb..e41ee19 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
@@ -20,11 +20,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import ro.fortsoft.pf4j.PluginWrapper;
+
import com.gitblit.manager.IGitblit;
-import com.gitblit.models.UserModel;
import com.gitblit.transport.ssh.SshDaemonClient;
import com.gitblit.transport.ssh.git.GitDispatcher;
-import com.gitblit.transport.ssh.gitblit.GitblitDispatcher;
+import com.gitblit.transport.ssh.keys.KeysDispatcher;
+import com.gitblit.utils.WorkQueue;
/**
* The root dispatcher is the dispatch command that handles registering all
@@ -36,25 +38,28 @@
private Logger log = LoggerFactory.getLogger(getClass());
- public RootDispatcher(IGitblit gitblit, SshDaemonClient client, String cmdLine) {
+ public RootDispatcher(IGitblit gitblit, SshDaemonClient client, String cmdLine, WorkQueue workQueue) {
super();
setContext(new SshCommandContext(gitblit, client, cmdLine));
+ setWorkQueue(workQueue);
- UserModel user = client.getUser();
- register(user, GitblitDispatcher.class);
- register(user, GitDispatcher.class);
+ register(VersionCommand.class);
+ register(GitDispatcher.class);
+ register(KeysDispatcher.class);
+ register(PluginDispatcher.class);
List<DispatchCommand> exts = gitblit.getExtensions(DispatchCommand.class);
for (DispatchCommand ext : exts) {
Class<? extends DispatchCommand> extClass = ext.getClass();
- String plugin = gitblit.whichPlugin(extClass).getDescriptor().getPluginId();
+ PluginWrapper wrapper = gitblit.whichPlugin(extClass);
+ String plugin = wrapper.getDescriptor().getPluginId();
CommandMetaData meta = extClass.getAnnotation(CommandMetaData.class);
- log.info("Dispatcher {} is loaded from plugin {}", meta.name(), plugin);
- register(user, ext);
+ log.debug("Dispatcher {} is loaded from plugin {}", meta.name(), plugin);
+ register(ext);
}
}
@Override
- protected final void setup(UserModel user) {
+ protected final void setup() {
}
}
\ No newline at end of file
--
Gitblit v1.9.1