From 9b575e8fac8d5e17e77cc284092abd856ddec8ac Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:35:29 -0400
Subject: [PATCH] Prepare 1.6.0 release

---
 src/main/java/com/gitblit/manager/GitblitManager.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 9510de8..98ad33e 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;
 
@@ -44,6 +45,7 @@
 
 import ro.fortsoft.pf4j.PluginState;
 import ro.fortsoft.pf4j.PluginWrapper;
+import ro.fortsoft.pf4j.Version;
 
 import com.gitblit.Constants;
 import com.gitblit.Constants.AccessPermission;
@@ -440,7 +442,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) {
@@ -482,7 +484,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();
@@ -600,8 +602,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
@@ -637,6 +659,11 @@
 	/*
 	 * NOTIFICATION MANAGER
 	 */
+
+	@Override
+	public boolean isSendingMail() {
+		return notificationManager.isSendingMail();
+	}
 
 	@Override
 	public void sendMailToAdministrators(String subject, String message) {
@@ -922,6 +949,11 @@
 	}
 
 	@Override
+	public void resetRepositoryCache(String repositoryName) {
+		repositoryManager.resetRepositoryCache(repositoryName);
+	}
+
+	@Override
 	public List<String> getRepositoryList() {
 		return repositoryManager.getRepositoryList();
 	}
@@ -1000,6 +1032,11 @@
 	@Override
 	public void updateConfiguration(Repository r, RepositoryModel repository) {
 		repositoryManager.updateConfiguration(r, repository);
+	}
+
+	@Override
+	public boolean canDelete(RepositoryModel model) {
+		return repositoryManager.canDelete(model);
 	}
 
 	@Override
@@ -1190,6 +1227,11 @@
 	 */
 
 	@Override
+	public Version getSystemVersion() {
+		return pluginManager.getSystemVersion();
+	}
+
+	@Override
 	public void startPlugins() {
 		pluginManager.startPlugins();
 	}
@@ -1245,8 +1287,8 @@
 	}
 
 	@Override
-	public boolean deletePlugin(String pluginId) {
-		return pluginManager.deletePlugin(pluginId);
+	public boolean uninstallPlugin(String pluginId) {
+		return pluginManager.uninstallPlugin(pluginId);
 	}
 
 	@Override
@@ -1260,6 +1302,11 @@
 	}
 
 	@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();
 	}

--
Gitblit v1.9.1