From 6bd25df6bd0dfbc2e516ba5d392e7ba580b6eea9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 16:16:54 -0400
Subject: [PATCH] Switch apt folder from 'dagger' to 'gen'
---
src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 749d10e..e41ee19 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
@@ -17,39 +17,49 @@
import java.util.List;
+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
* other commands.
*
*/
-public class RootDispatcher extends DispatchCommand {
+@CommandMetaData(name = "")
+class RootDispatcher extends DispatchCommand {
- public RootDispatcher(IGitblit gitblit, SshDaemonClient client, String cmdLine) {
+ private Logger log = LoggerFactory.getLogger(getClass());
+
+ public RootDispatcher(IGitblit gitblit, SshDaemonClient client, String cmdLine, WorkQueue workQueue) {
super();
setContext(new SshCommandContext(gitblit, client, cmdLine));
+ setWorkQueue(workQueue);
- final UserModel user = client.getUser();
- registerDispatcher(user, GitblitDispatcher.class);
- registerDispatcher(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) {
- registerDispatcher(user, ext);
+ Class<? extends DispatchCommand> extClass = ext.getClass();
+ PluginWrapper wrapper = gitblit.whichPlugin(extClass);
+ String plugin = wrapper.getDescriptor().getPluginId();
+ CommandMetaData meta = extClass.getAnnotation(CommandMetaData.class);
+ log.debug("Dispatcher {} is loaded from plugin {}", meta.name(), plugin);
+ register(ext);
}
}
@Override
- protected final void registerCommands(UserModel user) {
- }
-
- @Override
- protected final void registerCommand(UserModel user, Class<? extends BaseCommand> cmd) {
- throw new RuntimeException("The root dispatcher does not accept commands, only dispatchers!");
+ protected final void setup() {
}
}
\ No newline at end of file
--
Gitblit v1.9.1