From f8288af5c6233172a5ae29ed11c46b31b4316931 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 12 May 2011 17:37:29 -0400
Subject: [PATCH] Updated gitignore.
---
src/com/gitblit/GitBlit.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index bdfa590..62ff55e 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -22,7 +22,7 @@
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.models.RepositoryModel;
-import com.gitblit.wicket.models.User;
+import com.gitblit.wicket.models.UserModel;
public class GitBlit implements ServletContextListener {
@@ -67,14 +67,14 @@
this.loginService = loginService;
}
- public User authenticate(String username, char[] password) {
+ public UserModel authenticate(String username, char[] password) {
if (loginService == null) {
return null;
}
return loginService.authenticate(username, password);
}
- public User authenticate(Cookie[] cookies) {
+ public UserModel authenticate(Cookie[] cookies) {
if (loginService == null) {
return null;
}
@@ -89,19 +89,31 @@
return null;
}
- public void setCookie(WebResponse response, User user) {
+ public void setCookie(WebResponse response, UserModel user) {
Cookie userCookie = new Cookie(Constants.NAME, user.getCookie());
userCookie.setMaxAge(Integer.MAX_VALUE);
userCookie.setPath("/");
response.addCookie(userCookie);
}
-
- public User getUser(String username) {
- User user = loginService.getUserModel(username);
- return user;
+
+ public List<String> getAllUsernames() {
+ return loginService.getAllUsernames();
}
- public void editUserModel(User user, boolean isCreate) throws GitBlitException {
+ public UserModel getUserModel(String username) {
+ UserModel user = loginService.getUserModel(username);
+ return user;
+ }
+
+ public List<String> getRepositoryUsers(RepositoryModel repository) {
+ return loginService.getUsernamesForRole(repository.name);
+ }
+
+ public boolean setRepositoryUsers(RepositoryModel repository, List<String> repositoryUsers) {
+ return loginService.setUsernamesForRole(repository.name, repositoryUsers);
+ }
+
+ public void editUserModel(UserModel user, boolean isCreate) throws GitBlitException {
if (!loginService.updateUserModel(user)) {
throw new GitBlitException(isCreate ? "Failed to add user!" : "Failed to update user!");
}
@@ -125,7 +137,7 @@
return r;
}
- public List<RepositoryModel> getRepositoryModels(User user) {
+ public List<RepositoryModel> getRepositoryModels(UserModel user) {
List<String> list = getRepositoryList();
List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();
for (String repo : list) {
@@ -137,10 +149,10 @@
return repositories;
}
- public RepositoryModel getRepositoryModel(User user, String repositoryName) {
+ public RepositoryModel getRepositoryModel(UserModel user, String repositoryName) {
RepositoryModel model = getRepositoryModel(repositoryName);
if (model.accessRestriction.atLeast(AccessRestrictionType.VIEW)) {
- if (user != null && user.canView(model)) {
+ if (user != null && user.canAccessRepository(model.name)) {
return model;
}
return null;
@@ -161,7 +173,7 @@
model.owner = config.getString("gitblit", null, "owner");
model.useTickets = config.getBoolean("gitblit", "useTickets", false);
model.useDocs = config.getBoolean("gitblit", "useDocs", false);
- model.accessRestriction = AccessRestrictionType.fromString(config.getString("gitblit", null, "accessRestriction"));
+ model.accessRestriction = AccessRestrictionType.fromName(config.getString("gitblit", null, "accessRestriction"));
model.showRemoteBranches = config.getBoolean("gitblit", "showRemoteBranches", false);
}
r.close();
@@ -195,7 +207,7 @@
config.setString("gitblit", null, "owner", repository.owner);
config.setBoolean("gitblit", null, "useTickets", repository.useTickets);
config.setBoolean("gitblit", null, "useDocs", repository.useDocs);
- config.setString("gitblit", null, "accessRestriction", repository.accessRestriction.toString());
+ config.setString("gitblit", null, "accessRestriction", repository.accessRestriction.name());
config.setBoolean("gitblit", null, "showRemoteBranches", repository.showRemoteBranches);
try {
config.save();
@@ -206,7 +218,7 @@
}
public void configureContext(IStoredSettings settings) {
- logger.info("Configure GitBlit from " + settings.toString());
+ logger.info("Using configuration from " + settings.toString());
this.storedSettings = settings;
repositoriesFolder = new File(settings.getString(Keys.git.repositoriesFolder, "repos"));
exportAll = settings.getBoolean(Keys.git.exportAll, true);
--
Gitblit v1.9.1