From e5d0bacbf746e09a9194822b231cb27090f58973 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:52 -0400
Subject: [PATCH] Implement simple JSON-based plugin registry and install command
---
src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 896391f..3c37866 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/RootDispatcher.java
@@ -24,14 +24,15 @@
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;
/**
* The root dispatcher is the dispatch command that handles registering all
* other commands.
*
*/
-public class RootDispatcher extends DispatchCommand {
+@CommandMetaData(name = "")
+class RootDispatcher extends DispatchCommand {
private Logger log = LoggerFactory.getLogger(getClass());
@@ -39,9 +40,11 @@
super();
setContext(new SshCommandContext(gitblit, client, cmdLine));
- final UserModel user = client.getUser();
- registerDispatcher(user, GitblitDispatcher.class);
- registerDispatcher(user, GitDispatcher.class);
+ UserModel user = client.getUser();
+ register(user, VersionCommand.class);
+ register(user, GitDispatcher.class);
+ register(user, KeysDispatcher.class);
+ register(user, PluginDispatcher.class);
List<DispatchCommand> exts = gitblit.getExtensions(DispatchCommand.class);
for (DispatchCommand ext : exts) {
@@ -49,16 +52,11 @@
String plugin = gitblit.whichPlugin(extClass).getDescriptor().getPluginId();
CommandMetaData meta = extClass.getAnnotation(CommandMetaData.class);
log.info("Dispatcher {} is loaded from plugin {}", meta.name(), plugin);
- registerDispatcher(user, ext);
+ register(user, 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(UserModel user) {
}
}
\ No newline at end of file
--
Gitblit v1.9.1