[jboss-svn-commits] JBL Code SVN: r18643 - in labs/jbosslabs/labs-3.0-build: services/credential/src/main/java/org/jboss/labs/auth/impl and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-02-29 13:24:17 -0500 (Fri, 29 Feb 2008)
New Revision: 18643

Modified:
   labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ServiceRole.java
   labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/SuperUsers.java
   labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/User.java
   labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/UserRole.java
   labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java
Log:
fixed super roles problem

Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ServiceRole.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ServiceRole.java	2008-02-29 17:28:04 UTC (rev 18642)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/ServiceRole.java	2008-02-29 18:24:17 UTC (rev 18643)
@@ -84,6 +84,11 @@
 		return id.equals(o.getId());
 	}
 
+	@Override
+	public int hashCode() {
+		return id.hashCode();
+	}
+	
 	/**
 	 * @return
 	 */

Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/SuperUsers.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/SuperUsers.java	2008-02-29 17:28:04 UTC (rev 18642)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/SuperUsers.java	2008-02-29 18:24:17 UTC (rev 18643)
@@ -32,7 +32,6 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
 
 /**
  * @author tomaszszymanski
@@ -48,7 +47,7 @@
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	private AuthID id;
+	private String id;
 
 	@OneToMany
 	private Set<User> superUsers;
@@ -56,7 +55,7 @@
 	public SuperUsers() { }
 	
 	public SuperUsers(AuthID id) {
-		this.id = id;
+		this.id = id.getAuthId();
 	}
 	
 	public Set<User> getSuperUsers() {
@@ -71,11 +70,11 @@
 		superUsers.add(user);
 	}
 
-	public AuthID getId() {
+	public String getId() {
 		return id;
 	}
 
-	public void setId(AuthID id) {
+	public void setId(String id) {
 		this.id = id;
 	}
 

Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/User.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/User.java	2008-02-29 17:28:04 UTC (rev 18642)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/User.java	2008-02-29 18:24:17 UTC (rev 18643)
@@ -58,7 +58,7 @@
     private String password;
 
 	@OneToMany
-	private Set<UserRole> userRoles;
+	private Set<UserRole> userRoles = new TreeSet<UserRole>();
 
 	public User () { }
 	
@@ -137,9 +137,6 @@
 	 *            Role
 	 */
 	public void addRole(UserRole role) {
-		if (userRoles == null) {
-			userRoles = new TreeSet<UserRole>();
-		}
 
 		userRoles.add(role);
 	}
@@ -197,4 +194,8 @@
 		return name.compareTo(o.getName());
 	}
 
+	@Override
+	public int hashCode() {
+		return name.hashCode();
+	}
 }

Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/UserRole.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/UserRole.java	2008-02-29 17:28:04 UTC (rev 18642)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/auth/UserRole.java	2008-02-29 18:24:17 UTC (rev 18643)
@@ -69,5 +69,15 @@
 	public void setId(String id) {
 		this.id = id;
 	}
+	
+	public String toString() {
+		return "[UserRole::id="+id+"::desctiption="+description+"]";
+	}
 
+	@Override
+	public int hashCode() {
+		return id.hashCode();
+	}
+
+	
 }

Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java	2008-02-29 17:28:04 UTC (rev 18642)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java	2008-02-29 18:24:17 UTC (rev 18643)
@@ -151,7 +151,7 @@
 		User userEn = userService.getUserByLogin(user.getName());
 		ProjectID pid = getProjectID(projectId);
 		
-		SuperUsers su = manager.find(SuperUsers.class, pid);
+		SuperUsers su = manager.find(SuperUsers.class, pid.getAuthId());
 		
 		if (su == null) {
 			su = new SuperUsers(pid);