[jbpm-commits] JBoss JBPM SVN: r5041 - in jbpm4/trunk: modules/examples/src/test/java/org/jbpm/examples/mail/template and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Jun 16 00:33:46 EDT 2009


Author: jeff.yuchang
Date: 2009-06-16 00:33:46 -0400 (Tue, 16 Jun 2009)
New Revision: 5041

Modified:
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
   jbpm4/trunk/qa/build.xml
Log:
* JBPM-2172 update identity api usage and idmIdentitySessionImpl class.


Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java	2009-06-15 19:36:52 UTC (rev 5040)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/inline/InlineMailTest.java	2009-06-16 04:33:46 UTC (rev 5041)
@@ -45,6 +45,10 @@
 public class InlineMailTest extends JbpmTestCase {
 
   Wiser wiser = null;
+  
+  String groupId1;
+  
+  String groupId2;
 
   protected void setUp() throws Exception {
     super.setUp();
@@ -59,11 +63,11 @@
     identityService.createUser("bb", "Big Brother", null, "bb at oceania");
     identityService.createUser("obrien", null, "O'Brien", "obrien at miniluv");
     identityService.createUser("charr", null, "Charrington", "charr at miniluv");
-    identityService.createGroup("thinkpol");
-    identityService.createGroup("innerparty");
-    identityService.createMembership("obrien", "innerparty");
-    identityService.createMembership("charr", "thinkpol");
-    identityService.createMembership("obrien", "thinkpol");
+    groupId1 = identityService.createGroup("thinkpol");
+    groupId2 = identityService.createGroup("innerparty");
+    identityService.createMembership("obrien", groupId2);
+    identityService.createMembership("charr", groupId1);
+    identityService.createMembership("obrien", groupId1);
     
     // start mail server
     wiser = new Wiser();
@@ -75,12 +79,13 @@
     wiser.stop();
 
     // delete actors
-    identityService.deleteGroup("thinkpol");
-    identityService.deleteGroup("innerparty");
     identityService.deleteUser("bb");
     identityService.deleteUser("obrien");
     identityService.deleteUser("charr");
-
+    
+    identityService.deleteGroup(groupId1);
+    identityService.deleteGroup(groupId2);
+    
     super.tearDown();
   }
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java	2009-06-15 19:36:52 UTC (rev 5040)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/mail/template/TemplateMailTest.java	2009-06-16 04:33:46 UTC (rev 5041)
@@ -45,6 +45,10 @@
 public class TemplateMailTest extends JbpmTestCase {
 
   Wiser wiser = null;
+  
+  String group1;
+  
+  String group2;
 
   protected void setUp() throws Exception {
     super.setUp();
@@ -59,11 +63,11 @@
     identityService.createUser("bb", "Big Brother", null, "bb at oceania");
     identityService.createUser("obrien", null, "O'Brien", "obrien at miniluv");
     identityService.createUser("charr", null, "Charrington", "charr at miniluv");
-    identityService.createGroup("thinkpol");
-    identityService.createGroup("innerparty");
-    identityService.createMembership("obrien", "innerparty");
-    identityService.createMembership("charr", "thinkpol");
-    identityService.createMembership("obrien", "thinkpol");
+    group1 = identityService.createGroup("thinkpol");
+    group2 = identityService.createGroup("innerparty");
+    identityService.createMembership("obrien", group2);
+    identityService.createMembership("charr", group1);
+    identityService.createMembership("obrien", group1);
     
     // start mail server
     wiser = new Wiser();
@@ -75,8 +79,8 @@
     wiser.stop();
     
     // delete actors
-    identityService.deleteGroup("thinkpol");
-    identityService.deleteGroup("innerparty");
+    identityService.deleteGroup(group1);
+    identityService.deleteGroup(group2);
     identityService.deleteUser("bb");
     identityService.deleteUser("obrien");
     identityService.deleteUser("charr");

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java	2009-06-15 19:36:52 UTC (rev 5040)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java	2009-06-16 04:33:46 UTC (rev 5041)
@@ -34,18 +34,19 @@
 public class TaskCandidatesTest extends JbpmTestCase {
 
   long deploymentDbid;
+  String dept;
 
   protected void setUp() throws Exception {
     super.setUp();
 
     // create identities
-    identityService.createGroup("sales-dept");
+    dept = identityService.createGroup("sales-dept");
 
     identityService.createUser("johndoe", "John", "Doe");
-    identityService.createMembership("johndoe", "sales-dept");
+    identityService.createMembership("johndoe", dept, "developer");
 
     identityService.createUser("joesmoe", "Joe", "Smoe");
-    identityService.createMembership("joesmoe", "sales-dept");
+    identityService.createMembership("joesmoe", dept, "developer");
 
     // deploy process
     deploymentDbid = repositoryService.createDeployment()
@@ -58,7 +59,7 @@
     repositoryService.deleteDeploymentCascade(deploymentDbid);
 
     // delete identities
-    identityService.deleteGroup("sales-dept");
+    identityService.deleteGroup(dept);
     identityService.deleteUser("johndoe");
     identityService.deleteUser("joesmoe");
 

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java	2009-06-15 19:36:52 UTC (rev 5040)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java	2009-06-16 04:33:46 UTC (rev 5041)
@@ -33,15 +33,18 @@
 public class TaskSwimlaneTest extends JbpmTestCase {
 
   long deploymentDbid;
+  
+  String dept;
+  
 
   protected void setUp() throws Exception {
     super.setUp();
     
     // create identities
-    identityService.createGroup("sales-dept");
+    dept = identityService.createGroup("sales-dept");
 
     identityService.createUser("johndoe", "John", "Doe");
-    identityService.createMembership("johndoe", "sales-dept");
+    identityService.createMembership("johndoe", dept, "developer");
     
     // deploy process
     deploymentDbid = repositoryService.createDeployment()
@@ -55,7 +58,7 @@
     repositoryService.deleteDeploymentCascade(deploymentDbid);
 
     // delete identities
-    identityService.deleteGroup("sales-dept");
+    identityService.deleteGroup(dept);
     identityService.deleteUser("johndoe");
 
     super.tearDown();

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java	2009-06-15 19:36:52 UTC (rev 5040)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java	2009-06-16 04:33:46 UTC (rev 5041)
@@ -45,6 +45,8 @@
 
   protected IdentitySession identitySession;
 
+  protected String MEMBER_ROLE = "jbpm_member_role";
+  
   public JBossIdmIdentitySessionImpl(IdentitySession identitySession) {
     this.identitySession = identitySession;
   }
@@ -64,8 +66,7 @@
       if (businessEmail != null) {
     	  attrs.add(new SimpleAttribute(P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL, businessEmail));
       }
-      
-      
+            
       identitySession.getAttributesManager().addAttributes(idUser, attrs.toArray(new Attribute[attrs.size()]));
       return idUser.getId();
       
@@ -83,12 +84,7 @@
       
       List<User> users = new ArrayList<User>();
       for (org.jboss.identity.idm.api.User idUser : idUsers) {
-    	String name = idUser.getId();
-        String givenName = getAttributeString(idUser, P3PConstants.INFO_USER_NAME_GIVEN);
-        String familyName = getAttributeString(idUser, P3PConstants.INFO_USER_NAME_FAMILY);
-        
-        UserImpl user = new UserImpl(name, givenName, familyName);
-        users.add(user);
+        users.add(getUserInfo(idUser));
       }
       
       return users;
@@ -102,12 +98,7 @@
 	  try {
 		org.jboss.identity.idm.api.User idUser = identitySession.getPersistenceManager().findUser(userId);
 		if (idUser != null) {
-	    	String name = idUser.getId();
-	        String givenName = getAttributeString(idUser, P3PConstants.INFO_USER_NAME_GIVEN);
-	        String familyName = getAttributeString(idUser, P3PConstants.INFO_USER_NAME_FAMILY);			
-			
-			User user = new UserImpl(name, givenName, familyName);
-			return user;
+	    	return getUserInfo(idUser);
 		}
 		return null;
 	} catch (IdentityException e) {
@@ -115,6 +106,17 @@
 	}
   }
 
+private User getUserInfo(org.jboss.identity.idm.api.User idUser) throws IdentityException {
+	String name = idUser.getId();
+	String givenName = getAttributeString(idUser, P3PConstants.INFO_USER_NAME_GIVEN);
+	String familyName = getAttributeString(idUser, P3PConstants.INFO_USER_NAME_FAMILY);			
+	String businessEmail = getAttributeString(idUser, P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL);
+	
+	UserImpl user = new UserImpl(name, givenName, familyName);
+	user.setBusinessEmail(businessEmail);
+	return user;
+}
+
   public List<User> findUsersById(String... userIds) {
     List<User> users = new ArrayList<User>();
 	for (String userId : userIds){
@@ -129,11 +131,13 @@
 
   public List<User> findUsersByGroup(String groupId) {
 	try {
+		List<User> users = new ArrayList<User>();
 		org.jboss.identity.idm.api.Group idGroup = findIdmGroupById(groupId);
+		if (idGroup == null){
+			return users;
+		}
 		Collection<org.jboss.identity.idm.api.User> idusers = 
 				identitySession.getRelationshipManager().findAssociatedUsers(idGroup, false);
-		List<User> users = new ArrayList<User>();
-		
 		for (org.jboss.identity.idm.api.User iduser : idusers) {
 			users.add(findUserById(iduser.getId()));
 		}
@@ -156,8 +160,11 @@
   public String createGroup(String groupName, String groupType, String parentGroupId) {
     
     try {
-            	
-      org.jboss.identity.idm.api.Group group = identitySession.getPersistenceManager().createGroup(groupName, groupType);
+      String gtype = groupType;
+      if (gtype == null) {
+    	  gtype = Group.TYPE_UNIT;
+      }
+      org.jboss.identity.idm.api.Group group = identitySession.getPersistenceManager().createGroup(groupName, gtype);
       String groupId = group.getId();
       
       if (parentGroupId!=null) {
@@ -178,6 +185,9 @@
   public Group findGroupById(String groupId) {
 	try {
 		org.jboss.identity.idm.api.Group idGroup = findIdmGroupById(groupId);
+		if (idGroup == null) {
+			return null;
+		}
 		GroupImpl group = new GroupImpl();
 		group.setId(idGroup.getId());
 		group.setType(idGroup.getGroupType());
@@ -223,15 +233,15 @@
   public List<Group> findGroupsByUser(String userId) {
 	  
     try {
-		Collection<org.jboss.identity.idm.api.Group> idGroups = identitySession.getRelationshipManager().
-																	findAssociatedGroups(userId, null);
+		Collection<org.jboss.identity.idm.api.Group> idGroups = identitySession.getRoleManager()
+																	.findGroupsWithRelatedRole(userId, null);
 		
 		List<Group> groups = new ArrayList<Group>();
 		for (org.jboss.identity.idm.api.Group idGroup : idGroups) {
 			groups.add(findGroupById(idGroup.getId()));
 		}
 		return groups;
-	} catch (IdentityException e) {
+	} catch (Exception e) {
 		throw new JbpmException("Couldn't get Groups by userId [" + userId + "]", e);
 		
 	}
@@ -281,18 +291,14 @@
         throw new JbpmException("user "+userId+" doesn't exist");
       }
       
-      
-      if (role!=null) {
-        RoleType roleType = identitySession.getRoleManager().getRoleType(role);
-        if (roleType==null) {
-          roleType = identitySession.getRoleManager().createRoleType(role);
-        }
-        
-        identitySession.getRoleManager().createRole(roleType, idUser, group);
-        
-      } else {
-        identitySession.getRelationshipManager().associateUser(group, idUser);
+      if (role == null) {
+    	  role = MEMBER_ROLE;
       }
+	  RoleType roleType = identitySession.getRoleManager().getRoleType(role);
+	  if (roleType==null) {
+	    roleType = identitySession.getRoleManager().createRoleType(role);
+	  }
+      identitySession.getRoleManager().createRole(roleType, idUser, group);
       
     } catch (Exception e) {
       throw new JbpmException("couldn't create membership "+userId+", "+groupId+", "+role, e);

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-06-15 19:36:52 UTC (rev 5040)
+++ jbpm4/trunk/qa/build.xml	2009-06-16 04:33:46 UTC (rev 5041)
@@ -102,10 +102,10 @@
 	<target name="copy.jbossidm.jdbc.configuration" if="identity.component.idm">
 	  <copy file="../modules/distro/target/oracle/ojdbc14.jar"
 	        todir="${jbossidm.home}/lib" />
-      <copy file="jdbc/${database}.properties"
+      <!--copy file="jdbc/${database}.properties"
 	        todir="${jbossidm.home}/db/jdbc"
 			overwrite="true"
-			failonerror="false" />
+			failonerror="false" /-->
 	</target>
 
   <target name="integration.testrun.teardown"




More information about the jbpm-commits mailing list