From f762b160efd5cafd919a6fd7f9587f578eceb454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Oct 2011 16:59:44 -0400
Subject: [PATCH] Merge branch 'master' into rpc
---
src/com/gitblit/models/UserModel.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index f23fd29..0d88ce2 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -16,10 +16,19 @@
package com.gitblit.models;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
-public class UserModel implements Serializable {
+/**
+ * UserModel is a serializable model class that represents a user and the user's
+ * restricted repository memberships. Instances of UserModels are also used as
+ * servlet user principals.
+ *
+ * @author James Moger
+ *
+ */
+public class UserModel implements Principal, Serializable {
private static final long serialVersionUID = 1L;
@@ -27,7 +36,8 @@
public String username;
public String password;
public boolean canAdmin;
- public final List<String> repositories = new ArrayList<String>();
+ public boolean excludeFromFederation;
+ public final Set<String> repositories = new HashSet<String>();
public UserModel(String username) {
this.username = username;
@@ -42,6 +52,11 @@
}
@Override
+ public String getName() {
+ return username;
+ }
+
+ @Override
public String toString() {
return username;
}
--
Gitblit v1.9.1