diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractUser.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractUser.java index 43c0219a7..392d168d8 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractUser.java +++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/AbstractUser.java @@ -58,11 +58,6 @@ public abstract class AbstractUser implements User, Comparable { */ private String password; - /** - * This user's role. - */ - private Role role; - @Override public String getUsername() { return username; @@ -83,17 +78,6 @@ public abstract class AbstractUser implements User, Comparable { this.password = password; } - @Override - public Role getRole() { - return role; - } - - @Override - public void setRole(Role role) { - this.role = role; - } - - @Override public int hashCode() { if (username == null) return 0; diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Role.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Role.java deleted file mode 100644 index 6a18ed162..000000000 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/Role.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.sourceforge.guacamole.net.auth; - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is guacamole-ext. - * - * The Initial Developer of the Original Code is - * Michael Jumper. - * Portions created by the Initial Developer are Copyright (C) 2010 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -/** - * The role of a particular user, defining the access levels of that user. - * - * @author Michael Jumper - */ -public interface Role { - - /* FIXME: STUB */ - - /* - * POSSIBLE PERMISSIONS: - * - * UserManagementPermission(ADD/UPDATE/DELETE/VIEW, user or ANY) - * ConfigurationPermission(ADD/UPDATE/DELETE/VIEW, config or ANY) - * AdministrationPermission(ADD/REMOVE, permission or ANY) - * - * Each can be used with: - * - * add(Permission) - * remove(Permission) - * has(Permission) - * - */ - -} diff --git a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/User.java b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/User.java index 35a9f3dea..a91b9cc18 100644 --- a/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/User.java +++ b/guacamole-ext/src/main/java/net/sourceforge/guacamole/net/auth/User.java @@ -76,19 +76,4 @@ public interface User { */ public void setPassword(String password); - /** - * Returns the role of this User. The role defines exactly which permissions - * a particular user has. - * - * @return The role of this User. - */ - public Role getRole(); - - /** - * Sets the role of this User to the given Role. - * - * @param role The role which this User should have. - */ - public void setRole(Role role); - }