From 7baf2e4cd2ef8082b74937e26de75b01e630b5d4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 17 Apr 2014 12:00:35 -0400 Subject: [PATCH] Expose JGit 3.x receive pack settings as Gitblit settings --- src/main/java/com/gitblit/manager/GitblitManager.java | 157 ++++++++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 73 deletions(-) diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java index e3b6cf7..4ecb9c6 100644 --- a/src/main/java/com/gitblit/manager/GitblitManager.java +++ b/src/main/java/com/gitblit/manager/GitblitManager.java @@ -42,9 +42,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ro.fortsoft.pf4j.PluginClassLoader; +import ro.fortsoft.pf4j.PluginState; import ro.fortsoft.pf4j.PluginWrapper; -import ro.fortsoft.pf4j.RuntimeMode; +import ro.fortsoft.pf4j.Version; import com.gitblit.Constants; import com.gitblit.Constants.AccessPermission; @@ -61,6 +61,7 @@ import com.gitblit.models.GitClientApplication; import com.gitblit.models.Mailing; import com.gitblit.models.Metric; +import com.gitblit.models.PluginRegistry.InstallState; import com.gitblit.models.PluginRegistry.PluginRegistration; import com.gitblit.models.PluginRegistry.PluginRelease; import com.gitblit.models.ProjectModel; @@ -1190,73 +1191,8 @@ */ @Override - public <T> List<T> getExtensions(Class<T> clazz) { - return pluginManager.getExtensions(clazz); - } - - @Override - public PluginWrapper whichPlugin(Class<?> clazz) { - return pluginManager.whichPlugin(clazz); - } - - @Override - public boolean deletePlugin(PluginWrapper wrapper) { - return pluginManager.deletePlugin(wrapper); - } - - @Override - public boolean refreshRegistry() { - return pluginManager.refreshRegistry(); - } - - @Override - public boolean installPlugin(String url) { - return pluginManager.installPlugin(url); - } - - @Override - public boolean installPlugin(PluginRelease pv) { - return pluginManager.installPlugin(pv); - } - - @Override - public List<PluginRegistration> getRegisteredPlugins() { - return pluginManager.getRegisteredPlugins(); - } - - @Override - public PluginRegistration lookupPlugin(String idOrName) { - return pluginManager.lookupPlugin(idOrName); - } - - @Override - public PluginRelease lookupRelease(String idOrName, String version) { - return pluginManager.lookupRelease(idOrName, version); - } - - @Override - public List<PluginWrapper> getPlugins() { - return pluginManager.getPlugins(); - } - - @Override - public List<PluginWrapper> getResolvedPlugins() { - return pluginManager.getResolvedPlugins(); - } - - @Override - public List<PluginWrapper> getUnresolvedPlugins() { - return pluginManager.getUnresolvedPlugins(); - } - - @Override - public List<PluginWrapper> getStartedPlugins() { - return pluginManager.getStartedPlugins(); - } - - @Override - public void loadPlugins() { - pluginManager.loadPlugins(); + public Version getSystemVersion() { + return pluginManager.getSystemVersion(); } @Override @@ -1270,12 +1206,87 @@ } @Override - public PluginClassLoader getPluginClassLoader(String pluginId) { - return pluginManager.getPluginClassLoader(pluginId); + public List<PluginWrapper> getPlugins() { + return pluginManager.getPlugins(); } @Override - public RuntimeMode getRuntimeMode() { - return pluginManager.getRuntimeMode(); + public PluginWrapper getPlugin(String pluginId) { + return pluginManager.getPlugin(pluginId); + } + + @Override + public List<Class<?>> getExtensionClasses(String pluginId) { + return pluginManager.getExtensionClasses(pluginId); + } + + @Override + public <T> List<T> getExtensions(Class<T> clazz) { + return pluginManager.getExtensions(clazz); + } + + @Override + public PluginWrapper whichPlugin(Class<?> clazz) { + return pluginManager.whichPlugin(clazz); + } + + @Override + public PluginState startPlugin(String pluginId) { + return pluginManager.startPlugin(pluginId); + } + + @Override + public PluginState stopPlugin(String pluginId) { + return pluginManager.stopPlugin(pluginId); + } + + @Override + public boolean disablePlugin(String pluginId) { + return pluginManager.disablePlugin(pluginId); + } + + @Override + public boolean enablePlugin(String pluginId) { + return pluginManager.enablePlugin(pluginId); + } + + @Override + public boolean deletePlugin(String pluginId) { + return pluginManager.deletePlugin(pluginId); + } + + @Override + public boolean refreshRegistry(boolean verifyChecksum) { + return pluginManager.refreshRegistry(verifyChecksum); + } + + @Override + public boolean installPlugin(String url, boolean verifyChecksum) throws IOException { + return pluginManager.installPlugin(url, verifyChecksum); + } + + @Override + public boolean upgradePlugin(String pluginId, String url, boolean verifyChecksum) throws IOException { + return pluginManager.upgradePlugin(pluginId, url, verifyChecksum); + } + + @Override + public List<PluginRegistration> getRegisteredPlugins() { + return pluginManager.getRegisteredPlugins(); + } + + @Override + public List<PluginRegistration> getRegisteredPlugins(InstallState state) { + return pluginManager.getRegisteredPlugins(state); + } + + @Override + public PluginRegistration lookupPlugin(String pluginId) { + return pluginManager.lookupPlugin(pluginId); + } + + @Override + public PluginRelease lookupRelease(String pluginId, String version) { + return pluginManager.lookupRelease(pluginId, version); } } -- Gitblit v1.9.1