From b2fec20f1f1081607b54b3e7dd20b12d03cef113 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:01:30 -0400
Subject: [PATCH] Improve plugin manager based on upstreamed contributions to pf4j
---
src/main/java/com/gitblit/manager/GitblitManager.java | 152 +++++++++++++++++++++++++-------------------------
1 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index e3b6cf7..191d7cf 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -42,9 +42,8 @@
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 com.gitblit.Constants;
import com.gitblit.Constants.AccessPermission;
@@ -61,6 +60,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,76 +1190,6 @@
*/
@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();
- }
-
- @Override
public void startPlugins() {
pluginManager.startPlugins();
}
@@ -1270,12 +1200,82 @@
}
@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() {
+ return pluginManager.refreshRegistry();
+ }
+
+ @Override
+ public boolean installPlugin(String url, boolean verifyChecksum) throws IOException {
+ return pluginManager.installPlugin(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 idOrName) {
+ return pluginManager.lookupPlugin(idOrName);
+ }
+
+ @Override
+ public PluginRelease lookupRelease(String idOrName, String version) {
+ return pluginManager.lookupRelease(idOrName, version);
}
}
--
Gitblit v1.9.1