From 94146dd495aad8157c423bfd9a1ae47c8e26b32c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 16:59:08 -0400
Subject: [PATCH] Use forked guice-servlet jar rather than stock jar from Google
---
src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
index b42d29a..36a0218 100644
--- a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
+++ b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
@@ -17,15 +17,18 @@
import java.io.File;
import java.util.Date;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import com.gitblit.Constants;
import com.gitblit.IStoredSettings;
+import com.gitblit.manager.IManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
import com.gitblit.models.SettingModel;
+import com.google.inject.Injector;
public class MockRuntimeManager implements IRuntimeManager {
@@ -48,10 +51,15 @@
public MockRuntimeManager(IStoredSettings settings) {
this.settings = settings;
- this.serverStatus = new ServerStatus(true);
+ this.serverStatus = new ServerStatus();
this.serverStatus.servletContainer = "MockServer";
this.serverSettings = new ServerSettings();
+ }
+
+ @Override
+ public Injector getInjector() {
+ return null;
}
@Override
@@ -70,7 +78,27 @@
}
@Override
+ public Locale getLocale() {
+ return Locale.getDefault();
+ }
+
+ @Override
public boolean isServingRepositories() {
+ return true;
+ }
+
+ @Override
+ public boolean isServingHTTP() {
+ return true;
+ }
+
+ @Override
+ public boolean isServingGIT() {
+ return true;
+ }
+
+ @Override
+ public boolean isServingSSH() {
return true;
}
@@ -130,4 +158,13 @@
return settings.saveSettings(updatedSettings);
}
+ @Override
+ public IManager stop() {
+ return this;
+ }
+
+ @Override
+ public IRuntimeManager start() {
+ return this;
+ }
}
--
Gitblit v1.9.1