Author: jeff.yuchang Date: 2009-05-22 03:35:10 -0400 (Fri, 22 May 2009) New Revision: 4870 Modified: jbpm4/branches/idm/modules/distro/src/main/files/jboss/build.xml jbpm4/branches/idm/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java Log: * Finish the idm integration. Modified: jbpm4/branches/idm/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/branches/idm/modules/distro/src/main/files/jboss/build.xml 2009-05-21 10:49:13 UTC (rev 4869) +++ jbpm4/branches/idm/modules/distro/src/main/files/jboss/build.xml 2009-05-22 07:35:10 UTC (rev 4870) @@ -21,6 +21,8 @@ <property name="jboss.distro.path" value="${jboss.distro.dir}/${jboss.filename}" /> <property name="jboss.server.configuration" value="default" /> <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + + <property name="jbossidm.home" value="/local/deploy/jbossidm-1.0.0-SNAPSHOT" /> <!-- JDBC PROPERTIES --> <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> @@ -108,6 +110,7 @@ description="installs jbpm into jboss"> <antcall target="internal.install.jbpm.into.jboss.common" /> <antcall target="internal.install.jbpm.into.jboss.500specifics" /> + <antcall target="internal.install.idm.into.jboss" /> <antcall target="internal.install.jbpm.into.jboss.identity" /> <antcall target="internal.install.jbpm.into.jboss.db.${database}" /> </target> @@ -192,9 +195,18 @@ </copy> </target> + <target name="internal.install.idm.into.jboss" if="jbpm.identity.idm"> + <ant antfile="${jbossidm.home}/jboss/build.xml" target="install.jbossidm.into.jboss"> + <property name="jboss.home" value="${jboss.home}" /> + <property name="jboss.server.configuration" value="${jboss.server.configuration}" /> + <property name="database" value="${database}" /> + <property name="jbossidm.home" value="${jbossidm.home}" /> + </ant> + </target> + <target name="internal.install.jbpm.into.jboss.identity" if="jbpm.identity.idm"> <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> - <fileset dir="${jbpm.home}/jbpm.cfg.idm"> + <fileset dir="${jbpm.home}/jboss/jbpm.cfg.idm"> <include name="jbpm.cfg.xml"/> </fileset> </copy> 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-21 10:49:13 UTC (rev 4869) +++ jbpm4/branches/idm/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-05-22 07:35:10 UTC (rev 4870) @@ -182,8 +182,19 @@ group.setType(idGroup.getGroupType()); group.setName(idGroup.getName()); - //TODO add parent group if necessary. + Collection<org.jboss.identity.idm.api.Group> idParentGroups = + identitySession.getRelationshipManager().findAssociatedGroups(idGroup, null, false, false); + if (idParentGroups.size() > 0) { + org.jboss.identity.idm.api.Group idParent = idParentGroups.iterator().next(); + GroupImpl parentGroup = new GroupImpl(); + parentGroup.setId(idParent.getId()); + parentGroup.setType(idParent.getGroupType()); + parentGroup.setName(idParent.getName()); + + group.setParent(parentGroup); + } + return group; } catch (IdentityException e) {