[jbpm-commits] JBoss JBPM SVN: r4879 - in jbpm4/branches/idm/modules: pvm/src/main/java/org/jbpm/pvm/internal/identity/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: jeff.yuchang
Date: 2009-05-24 15:24:23 -0400 (Sun, 24 May 2009)
New Revision: 4879

Modified:
   jbpm4/branches/idm/modules/examples/src/test/java/org/jbpm/examples/identity/IdentityTest.java
   jbpm4/branches/idm/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
Log:
* update.


Modified: jbpm4/branches/idm/modules/examples/src/test/java/org/jbpm/examples/identity/IdentityTest.java
===================================================================
--- jbpm4/branches/idm/modules/examples/src/test/java/org/jbpm/examples/identity/IdentityTest.java	2009-05-24 18:41:17 UTC (rev 4878)
+++ jbpm4/branches/idm/modules/examples/src/test/java/org/jbpm/examples/identity/IdentityTest.java	2009-05-24 19:24:23 UTC (rev 4879)
@@ -41,7 +41,7 @@
 	
 	identityService.createUser("johndoe", "John", "Doe");
 	redhatGroupId = identityService.createGroup("redhat", Group.TYPE_UNIT, null);
-	
+	identityService.createMembership(johndoe, redhatGroupId, "Developer");
   }
   
   
@@ -73,9 +73,11 @@
   }
   
   public void testFindGroupsByUser() throws Exception {
-	  identityService.createMembership(johndoe, redhatGroupId, "Developer");
 	  
-	  List<Group> groups = identityService.findGroupsByUser(johndoe);
+	  identityService.createUser("jeffyu", "Jeff", "Yu");
+	  identityService.createMembership("jeffyu", redhatGroupId);
+	  
+	  List<Group> groups = identityService.findGroupsByUser("jeffyu");
 	  assertTrue(groups.size() > 0);
 	  
 	  for (Group group : groups) {
@@ -84,11 +86,13 @@
 			  return;
 		  }
 	  }
+	  
+	  identityService.deleteUser("jeffyu");
+	  
 	  fail("Can't find the group by userid: " + johndoe);
   }
   
   public void testFindGroupByUserAndGroupType() throws Exception {
-	  identityService.createMembership(johndoe, redhatGroupId, "Developer");
 	  List<Group> groups = identityService.findGroupsByUserAndGroupType(johndoe, Group.TYPE_UNIT);
 	  assertTrue(groups.size() > 0);
 	  
@@ -102,13 +106,13 @@
   }
 
   public void testSingleGroup() throws Exception {
-    identityService.createUser("joesmoe", "Joe", "Smoe");
+    
+	identityService.createUser("joesmoe", "Joe", "Smoe");
     identityService.createUser("jackblack", "Jack", "Black");
     
     String jbossId = identityService.createGroup("jboss", Group.TYPE_UNIT, redhatGroupId);
     String jbpmId = identityService.createGroup("jbpm", Group.TYPE_UNIT, jbossId);
     
-    identityService.createMembership("johndoe", jbpmId, "developer");
     identityService.createMembership("joesmoe", jbpmId, "developer");
     identityService.createMembership("jackblack", jbossId, "manager");
     

Modified: jbpm4/branches/idm/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
===================================================================
--- jbpm4/branches/idm/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java	2009-05-24 18:41:17 UTC (rev 4878)
+++ jbpm4/branches/idm/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java	2009-05-24 19:24:23 UTC (rev 4879)
@@ -247,8 +247,8 @@
     try {
       org.jboss.identity.idm.api.User idUser = identitySession.getPersistenceManager().findUser(userName);
       
-      Collection<org.jboss.identity.idm.api.Group> idGroups = identitySession.getRelationshipManager()
-      													.findAssociatedGroups(idUser, groupType);
+      Collection<org.jboss.identity.idm.api.Group> idGroups = identitySession.getRoleManager()
+      														.findGroupsWithRelatedRole(idUser, groupType, null);
       List<Group> groups = new ArrayList<Group>();
       
       for (org.jboss.identity.idm.api.Group idGroup : idGroups) {