Author: bpapez
Date: Fri Jan 18 14:04:18 2008
New Revision: 19538
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19538&repname=
=3Djahia
Log:
CONE-60: some modifications to allow managing group memberships despite laz=
y loading
Modified:
trunk/core/src/java/org/jahia/admin/users/ManageGroups.java
trunk/core/src/java/org/jahia/hibernate/manager/JahiaGroupManager.java
trunk/core/src/java/org/jahia/services/usermanager/JahiaDBGroup.java
trunk/core/src/java/org/jahia/services/usermanager/JahiaGroup.java
trunk/core/src/java/org/jahia/services/usermanager/JahiaLDAPGroup.java
Modified: trunk/core/src/java/org/jahia/admin/users/ManageGroups.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/users/ManageGroups.java&rev=3D19538&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/admin/users/ManageGroups.java (original)
+++ trunk/core/src/java/org/jahia/admin/users/ManageGroups.java Fri Jan 18 =
14:04:18 2008
@@ -42,6 +42,8 @@
import org.jahia.data.events.JahiaEvent;
import org.jahia.data.viewhelper.principal.PrincipalViewHelper;
import org.jahia.exceptions.JahiaException;
+import org.jahia.hibernate.manager.JahiaGroupManager;
+import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.resourcebundle.JahiaResourceBundle;
@@ -899,7 +901,14 @@
JahiaGroup theGroup =3D (JahiaGroup)gMgr.lookupGroup(jahiaSite, gr=
oupName);
Set groupMembers =3D new HashSet();
if (theGroup !=3D null) {
- Enumeration groupMembersEnum =3D theGroup.members();
+ Enumeration groupMembersEnum =3D theGroup.isPreloadedGroups()=
? theGroup
+ .members()
+ : (new Vector(((JahiaGroupManager) SpringContextSingle=
ton
+ .getInstance().getContext().getBean(
+ JahiaGroupManager.class.getName()))
+ .getGroupMembers(theGroup.getGroupKey()).value=
s()))
+ .elements();
+ =
while (groupMembersEnum.hasMoreElements()) {
Object member =3D (Object)groupMembersEnum.nextElement();
// keep only members from this jahiaSite...
Modified: trunk/core/src/java/org/jahia/hibernate/manager/JahiaGroupManager=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/manager/JahiaGroupManager.java&rev=3D19538&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/hibernate/manager/JahiaGroupManager.java =
(original)
+++ trunk/core/src/java/org/jahia/hibernate/manager/JahiaGroupManager.java =
Fri Jan 18 14:04:18 2008
@@ -414,8 +414,8 @@
}
}
=
- private Map getGroupMembers(JahiaGrp jahiaGrp) {
- List memberIds =3D accessDAO.findMemberIdsFromGroupName(jahiaGrp.g=
etKey());
+ public Map getGroupMembers(String groupKey) {
+ List memberIds =3D accessDAO.findMemberIdsFromGroupName(groupKey);
Map members =3D new FastHashMap(memberIds.size());
for (int i =3D 0; i < memberIds.size(); i++) {
Object[] objects =3D (Object[]) memberIds.get(i);
@@ -434,6 +434,10 @@
}
}
return members;
+ } =
+ =
+ private Map getGroupMembers(JahiaGrp jahiaGrp) {
+ return getGroupMembers(jahiaGrp.getKey());
}
=
public Map getGroupsInSite(int siteID) {
Modified: trunk/core/src/java/org/jahia/services/usermanager/JahiaDBGroup.j=
ava
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/usermanager/JahiaDBGroup.java&rev=3D19538&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/usermanager/JahiaDBGroup.java (o=
riginal)
+++ trunk/core/src/java/org/jahia/services/usermanager/JahiaDBGroup.java Fr=
i Jan 18 14:04:18 2008
@@ -62,9 +62,11 @@
/** Group additional parameters. */
private Properties mProperties =3D new Properties ();
=
- private boolean preloadedGroups;
-
- private Set notMembers =3D new HashSet(); =
+ public JahiaDBGroup (int id, String groupname, String groupKey, int si=
teID,
+ Map members, Properties properties) {
+ this(id, groupname, groupKey, siteID, members, properties,
+ members !=3D null && !members.isEmpty() ? true : false);
+ } =
=
//--------------------------------------------------------------------=
-----
/**
Modified: trunk/core/src/java/org/jahia/services/usermanager/JahiaGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/usermanager/JahiaGroup.java&rev=3D19538&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/usermanager/JahiaGroup.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/services/usermanager/JahiaGroup.java Fri =
Jan 18 14:04:18 2008
@@ -88,7 +88,10 @@
/** Hashtable holding all the group members. Is assumed to be never nu=
ll. */
protected Map mMembers =3D new Hashtable ();
=
+ protected boolean preloadedGroups;
=
+ protected Set notMembers =3D new HashSet(); =
+ =
/**
* Get grp's properties list.
*
@@ -426,4 +429,9 @@
*/
public abstract String getProviderName ();
=
+
+ public boolean isPreloadedGroups() {
+ return preloadedGroups;
+ }
+
}
\ No newline at end of file
Modified: trunk/core/src/java/org/jahia/services/usermanager/JahiaLDAPGroup=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/usermanager/JahiaLDAPGroup.java&rev=3D19538&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/usermanager/JahiaLDAPGroup.java =
(original)
+++ trunk/core/src/java/org/jahia/services/usermanager/JahiaLDAPGroup.java =
Fri Jan 18 14:04:18 2008
@@ -57,12 +57,8 @@
// LDAP dynamic group (groupOfURLs)
private boolean dynamic;
=
- private boolean preloadedGroups;
-
private JahiaGroupManagerLDAPProvider myProvider;
=
- private Set notMembers =3D new HashSet();
-
/**
* Instanciate a new JahiaDBGroup object.
*
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
