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/test/java/com/gitblit/tests/mock/MockRuntimeManager.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 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 aaa6c66..36a0218 100644
--- a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
+++ b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
@@ -17,6 +17,7 @@
import java.io.File;
import java.util.Date;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
@@ -27,6 +28,7 @@
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 {
@@ -56,6 +58,11 @@
}
@Override
+ public Injector getInjector() {
+ return null;
+ }
+
+ @Override
public void setBaseFolder(File folder) {
this.baseFolder = folder;
}
@@ -71,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;
}
@@ -137,7 +164,7 @@
}
@Override
- public IRuntimeManager setup() {
+ public IRuntimeManager start() {
return this;
}
}
--
Gitblit v1.9.1