From 34d7d04aa8a1a7706be333f5eb0a4aec7f066850 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 05 Jul 2014 12:28:37 -0400
Subject: [PATCH] Merge branch 'ticket/137' into develop
---
src/main/java/com/gitblit/manager/RuntimeManager.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/RuntimeManager.java b/src/main/java/com/gitblit/manager/RuntimeManager.java
index 52f4d67..95a363f 100644
--- a/src/main/java/com/gitblit/manager/RuntimeManager.java
+++ b/src/main/java/com/gitblit/manager/RuntimeManager.java
@@ -32,7 +32,11 @@
import com.gitblit.models.ServerStatus;
import com.gitblit.models.SettingModel;
import com.gitblit.utils.StringUtils;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+@Singleton
public class RuntimeManager implements IRuntimeManager {
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -47,6 +51,10 @@
private TimeZone timezone;
+ @Inject
+ private Injector injector;
+
+ @Inject
public RuntimeManager(IStoredSettings settings) {
this(settings, null);
}
@@ -72,6 +80,11 @@
@Override
public RuntimeManager stop() {
return this;
+ }
+
+ @Override
+ public Injector getInjector() {
+ return injector;
}
@Override
@@ -109,19 +122,6 @@
}
// settingsModel.pushScripts = getAllScripts();
return settingsModel;
- }
-
- /**
- * Determine if this Gitblit instance is actively serving git repositories
- * or if it is merely a repository viewer.
- *
- * @return true if Gitblit is serving repositories
- */
- @Override
- public boolean isServingRepositories() {
- return settings.getBoolean(Keys.git.enableGitServlet, true)
- || (settings.getInteger(Keys.git.daemonPort, 0) > 0)
- || (settings.getInteger(Keys.git.sshPort, 0) > 0);
}
/**
--
Gitblit v1.9.1