From 35fe70c73a4341d9288ead5ca4792a86b485b788 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 17:00:40 -0400
Subject: [PATCH] Adjust builds for appropriate dependencies
---
src/main/java/com/gitblit/manager/GitblitManager.java | 180 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 6b1cc8a..a0718f7 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -27,6 +27,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
@@ -42,9 +43,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 +62,9 @@
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;
import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.RepositoryModel;
@@ -83,6 +87,7 @@
import com.google.gson.JsonIOException;
import com.google.gson.JsonSyntaxException;
import com.google.gson.reflect.TypeToken;
+import com.google.inject.Injector;
/**
* GitblitManager is an aggregate interface delegate. It implements all the manager
@@ -336,6 +341,9 @@
repositoryManager.updateRepositoryModel(model.name, model, false);
}
}
+
+ // rename the user's ssh public keystore
+ getPublicKeyManager().renameUser(username, user.username);
}
if (!userManager.updateUserModel(username, user)) {
throw new GitBlitException("Failed to update user!");
@@ -435,7 +443,7 @@
// no user definitions, use system definitions
if (!clientApplications.hasCurrent("system", new Date(0))) {
try {
- InputStream is = getClass().getResourceAsStream("/clientapps.json");
+ InputStream is = GitblitManager.class.getResourceAsStream("/clientapps.json");
Collection<GitClientApplication> clients = readClientApplications(is);
is.close();
if (clients != null) {
@@ -477,7 +485,7 @@
// Read bundled Gitblit properties to extract setting descriptions.
// This copy is pristine and only used for populating the setting
// models map.
- InputStream is = getClass().getResourceAsStream("/reference.properties");
+ InputStream is = GitblitManager.class.getResourceAsStream("/reference.properties");
BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is));
StringBuilder description = new StringBuilder();
SettingModel setting = new SettingModel();
@@ -595,8 +603,28 @@
}
@Override
+ public boolean isServingHTTP() {
+ return runtimeManager.isServingHTTP();
+ }
+
+ @Override
+ public boolean isServingGIT() {
+ return runtimeManager.isServingGIT();
+ }
+
+ @Override
+ public boolean isServingSSH() {
+ return runtimeManager.isServingSSH();
+ }
+
+ @Override
public TimeZone getTimezone() {
return runtimeManager.getTimezone();
+ }
+
+ @Override
+ public Locale getLocale() {
+ return runtimeManager.getLocale();
}
@Override
@@ -629,9 +657,19 @@
return runtimeManager.getStatus();
}
+ @Override
+ public Injector getInjector() {
+ return runtimeManager.getInjector();
+ }
+
/*
* NOTIFICATION MANAGER
*/
+
+ @Override
+ public boolean isSendingMail() {
+ return notificationManager.isSendingMail();
+ }
@Override
public void sendMailToAdministrators(String subject, String message) {
@@ -917,6 +955,11 @@
}
@Override
+ public void resetRepositoryCache(String repositoryName) {
+ repositoryManager.resetRepositoryCache(repositoryName);
+ }
+
+ @Override
public List<String> getRepositoryList() {
return repositoryManager.getRepositoryList();
}
@@ -995,6 +1038,11 @@
@Override
public void updateConfiguration(Repository r, RepositoryModel repository) {
repositoryManager.updateConfiguration(r, repository);
+ }
+
+ @Override
+ public boolean canDelete(RepositoryModel model) {
+ return repositoryManager.canDelete(model);
}
@Override
@@ -1180,44 +1228,13 @@
return repositoryManager.isIdle(repository);
}
- @Override
- public <T> List<T> getExtensions(Class<T> clazz) {
- return pluginManager.getExtensions(clazz);
- }
+ /*
+ * PLUGIN MANAGER
+ */
@Override
- public PluginWrapper whichPlugin(Class<?> clazz) {
- return pluginManager.whichPlugin(clazz);
- }
-
- @Override
- public boolean deletePlugin(PluginWrapper wrapper) {
- return pluginManager.deletePlugin(wrapper);
- }
-
- @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
@@ -1231,12 +1248,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 uninstallPlugin(String pluginId) {
+ return pluginManager.uninstallPlugin(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