From 049a68bfee34d99be8a4d4d7124283862625641a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 24 Apr 2012 20:43:25 -0400
Subject: [PATCH] Corrected log typos
---
src/com/gitblit/GitBlit.java | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index e166795..2b7ba3c 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -377,6 +377,22 @@
this.userService = userService;
this.userService.setup(settings);
}
+
+ /**
+ *
+ * @return true if the user service supports credential changes
+ */
+ public boolean supportsCredentialChanges() {
+ return userService.supportsCredentialChanges();
+ }
+
+ /**
+ *
+ * @return true if the user service supports team membership changes
+ */
+ public boolean supportsTeamMembershipChanges() {
+ return userService.supportsTeamMembershipChanges();
+ }
/**
* Authenticate a user based on a username and password.
@@ -1054,47 +1070,31 @@
repository.federationStrategy.name());
config.setBoolean("gitblit", null, "isFederated", repository.isFederated);
- // federation sets
- if (ArrayUtils.isEmpty(repository.federationSets)) {
- config.unset("gitblit", null, "federationSets");
- } else {
- config.setStringList("gitblit", null, "federationSets", repository.federationSets);
- }
+ updateList(config, "federationSets", repository.federationSets);
+ updateList(config, "preReceiveScript", repository.preReceiveScripts);
+ updateList(config, "postReceiveScript", repository.postReceiveScripts);
+ updateList(config, "mailingList", repository.mailingLists);
+ updateList(config, "indexBranch", repository.indexedBranches);
- // pre receive scripts
- if (ArrayUtils.isEmpty(repository.preReceiveScripts)) {
- config.unset("gitblit", null, "preReceiveScript");
- } else {
- config.setStringList("gitblit", null, "preReceiveScript", repository.preReceiveScripts);
- }
-
- // post receive scripts
- if (ArrayUtils.isEmpty(repository.postReceiveScripts)) {
- config.unset("gitblit", null, "postReceiveScript");
- } else {
- config.setStringList("gitblit", null, "postReceiveScript",
- repository.postReceiveScripts);
- }
-
- // mailing lists
- if (ArrayUtils.isEmpty(repository.mailingLists)) {
- config.unset("gitblit", null, "mailingList");
- } else {
- config.setStringList("gitblit", null, "mailingList", repository.mailingLists);
- }
-
- // indexed branches
- if (ArrayUtils.isEmpty(repository.indexedBranches)) {
- config.unset("gitblit", null, "indexBranch");
- } else {
- config.setStringList("gitblit", null, "indexBranch", repository.indexedBranches);
- }
try {
config.save();
} catch (IOException e) {
logger.error("Failed to save repository config!", e);
}
}
+
+ private void updateList(StoredConfig config, String field, List<String> list) {
+ // a null list is skipped, not cleared
+ // this is for RPC administration where an older manager might be used
+ if (list == null) {
+ return;
+ }
+ if (ArrayUtils.isEmpty(list)) {
+ config.unset("gitblit", null, field);
+ } else {
+ config.setStringList("gitblit", null, field, list);
+ }
+ }
/**
* Deletes the repository from the file system and removes the repository
--
Gitblit v1.9.1