From 575d4f690b8eaedfdd3981fe7c00ecc41d358e73 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 16:57:47 -0400
Subject: [PATCH] Temporarily depend on patched guice-servlet (guice-807)
---
src/main/java/com/gitblit/manager/GitblitManager.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 61a0949..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;
@@ -86,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
@@ -441,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) {
@@ -483,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();
@@ -601,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
@@ -635,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) {
@@ -923,6 +955,11 @@
}
@Override
+ public void resetRepositoryCache(String repositoryName) {
+ repositoryManager.resetRepositoryCache(repositoryName);
+ }
+
+ @Override
public List<String> getRepositoryList() {
return repositoryManager.getRepositoryList();
}
@@ -1004,6 +1041,11 @@
}
@Override
+ public boolean canDelete(RepositoryModel model) {
+ return repositoryManager.canDelete(model);
+ }
+
+ @Override
public boolean deleteRepositoryModel(RepositoryModel model) {
return repositoryManager.deleteRepositoryModel(model);
}
--
Gitblit v1.9.1