From 3286926d2ec11445f76cd170e4c2fcff597a0754 Mon Sep 17 00:00:00 2001
From: Fabrice Bacchella <fbacchella@spamcop.net>
Date: Tue, 26 May 2015 04:48:40 -0400
Subject: [PATCH] Two slight improvement for custom UserService: - try userRealm as a file only if class is not found, other exeptions are real error - log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString
---
src/test/java/com/gitblit/tests/GitServletTest.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitServletTest.java b/src/test/java/com/gitblit/tests/GitServletTest.java
index ad61a67..705684a 100644
--- a/src/test/java/com/gitblit/tests/GitServletTest.java
+++ b/src/test/java/com/gitblit/tests/GitServletTest.java
@@ -177,7 +177,7 @@
model.authorizationControl = AuthorizationControl.NAMED;
UserModel user = new UserModel("james");
user.password = "james";
- gitblit().updateUserModel(user.username, user, true);
+ gitblit().addUser(user);
repositories().updateRepositoryModel(model.name, model, false);
FileUtils.delete(ticgit2Folder, FileUtils.RECURSIVE);
@@ -419,7 +419,7 @@
// grant user push permission
user.setRepositoryPermission(model.name, AccessPermission.PUSH);
- gitblit().updateUserModel(user.username, user, true);
+ gitblit().addUser(user);
repositories().updateRepositoryModel(model.name, model, false);
// clone temp bare repo to working copy
@@ -504,7 +504,7 @@
// grant user push permission
user.setRepositoryPermission(model.name, AccessPermission.PUSH);
- gitblit().updateUserModel(user.username, user, true);
+ gitblit().addUser(user);
repositories().updateRepositoryModel(model.name, model, false);
// clone temp bare repo to working copy
@@ -657,7 +657,7 @@
// grant user specified
user.setRepositoryPermission(model.name, permission);
- gitblit().updateUserModel(user.username, user, true);
+ gitblit().addUser(user);
repositories().updateRepositoryModel(model.name, model, false);
// clone temp bare repo to working copy
@@ -827,7 +827,7 @@
user.canCreate = canCreate;
user.canAdmin = canAdmin;
- gitblit().updateUserModel(user.username, user, true);
+ gitblit().addUser(user);
CredentialsProvider cp = new UsernamePasswordCredentialsProvider(user.username, user.password);
--
Gitblit v1.9.1