From 8d88096236fe70b850a29f548432299a866886e6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Renamed Gitblit to GitBlit to not break existing Groovy hooks
---
src/main/java/com/gitblit/GitBlit.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/Gitblit.java b/src/main/java/com/gitblit/GitBlit.java
similarity index 95%
rename from src/main/java/com/gitblit/Gitblit.java
rename to src/main/java/com/gitblit/GitBlit.java
index 64316bb..0dcc765 100644
--- a/src/main/java/com/gitblit/Gitblit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -54,7 +54,7 @@
import com.gitblit.models.UserModel;
/**
- * Gitblit is an aggregate interface delegate. It implements all the manager
+ * GitBlit is an aggregate interface delegate. It implements all the manager
* interfaces and delegates all methods calls to the actual manager implementations.
* It's primary purpose is to provide complete management control to the git
* upload and receive pack functions.
@@ -62,7 +62,7 @@
* @author James Moger
*
*/
-public class Gitblit implements IRuntimeManager,
+public class GitBlit implements IRuntimeManager,
INotificationManager,
IUserManager,
ISessionManager,
@@ -87,7 +87,7 @@
private final IFederationManager federationManager;
- public Gitblit(
+ public GitBlit(
IRuntimeManager runtimeManager,
INotificationManager notificationManager,
IUserManager userManager,
@@ -108,13 +108,36 @@
}
@Override
- public Gitblit start() {
+ public GitBlit start() {
return this;
}
@Override
- public Gitblit stop() {
+ public GitBlit stop() {
return this;
+ }
+
+ /*
+ * ISTOREDSETTINGS
+ *
+ * these methods are necessary for (nearly) seamless Groovy hook operation
+ * after the massive refactor.
+ */
+
+ public boolean getBoolean(String key, boolean defaultValue) {
+ return runtimeManager.getSettings().getBoolean(key, defaultValue);
+ }
+
+ public String getString(String key, String defaultValue) {
+ return runtimeManager.getSettings().getString(key, defaultValue);
+ }
+
+ public int getInteger(String key, int defaultValue) {
+ return runtimeManager.getSettings().getInteger(key, defaultValue);
+ }
+
+ public List<String> getStrings(String key) {
+ return runtimeManager.getSettings().getStrings(key);
}
/*
@@ -268,11 +291,6 @@
}
@Override
- public void logout(UserModel user) {
- userManager.logout(user);
- }
-
- @Override
public List<String> getAllUsernames() {
return userManager.getAllUsernames();
}
@@ -313,8 +331,8 @@
}
@Override
- public UserModel authenticate(char[] cookie) {
- return userManager.authenticate(cookie);
+ public UserModel getUserModel(char[] cookie) {
+ return userManager.getUserModel(cookie);
}
@Override
--
Gitblit v1.9.1