[gatein-commits] gatein SVN: r9046 - in epp/portal/branches/EPP_5_2_Branch: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directories.
Author: mputz
Date: 2013-01-11 05:29:32 -0500 (Fri, 11 Jan 2013)
New Revision: 9046
Modified:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java
Log:
Bug 893563 - Fixes to improve user search, requires PicketLink update to 1.3.3.Final
Modified:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java 2013-01-11
10:11:51 UTC (rev 9045)
+++
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java 2013-01-11
10:29:32 UTC (rev 9046)
@@ -103,7 +103,7 @@
//
int i = 0;
- for (; i < roles.size(); i++)
+ for (; i < length; i++)
{
Role role = roles.get(i);
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2013-01-11 10:11:51 UTC (rev 9045)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2013-01-11 10:29:32 UTC (rev 9046)
@@ -52,7 +52,7 @@
<org.gatein.dep.version>1.1.0-GA</org.gatein.dep.version>
<org.gatein.wci.version>2.1.1-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.1-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.3.2.CR01</org.picketlink.idm>
+ <org.picketlink.idm>1.3.3.Final</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.7-EPP522-GA</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.2-GA</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.1-GA</org.gatein.mgmt.version>
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java
===================================================================
---
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java 2013-01-11
10:11:51 UTC (rev 9045)
+++
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java 2013-01-11
10:29:32 UTC (rev 9046)
@@ -132,14 +132,9 @@
}
else
{
- OrganizationService service =
getApplicationComponent(OrganizationService.class);
- MembershipHandler handler = service.getMembershipHandler();
- ListAccess<?> list = handler.findAllMembershipsByGroup(group);
- pageList = new FindMembershipByGroupPageList(group.getId(),
- list.getSize() > 10 ? list.getSize() : 10);
+ pageList = new FindMembershipByGroupPageList(group.getId(), 5);
}
UIGridUser uiGrid = getChild(UIGridUser.class);
- pageList.setPageSize(5);
UIPageIterator pageIterator = uiGrid.getUIPageIterator();
/** We keep the currently selected page index **/