Author: bpapez
Date: Mon Jan 21 10:58:03 2008
New Revision: 19552
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19552&repname=
=3Djahia
Log:
CONE-60: some modifications to allow managing group memberships despite laz=
y loading
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/admin/users/ManageGroups.j=
ava
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
DBGroup.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
Group.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
GroupManagerDBProvider.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
LDAPGroup.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/admin/users/ManageGr=
oups.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/admin/users/ManageGroups.java&rev=3D19552&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
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/admin/users/ManageGroups.j=
ava (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/admin/users/ManageGroups.j=
ava Mon Jan 21 10:58:03 2008
@@ -47,6 +47,7 @@
import org.jahia.services.sites.JahiaSitesService;
import org.jahia.services.usermanager.JahiaDBUser;
import org.jahia.services.usermanager.JahiaGroup;
+import org.jahia.services.usermanager.JahiaGroupManagerDBProvider;
import org.jahia.services.usermanager.JahiaGroupManagerService;
import org.jahia.services.usermanager.JahiaSiteGroupManagerService;
import org.jahia.services.usermanager.JahiaUser;
@@ -835,7 +836,11 @@
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(JahiaGroupManagerDBProvider.getInstance()
+ .getGroupMembers(theGroup.getGroupKey()).value=
s()))
+ .elements();
while (groupMembersEnum.hasMoreElements()) {
Object member =3D (Object)groupMembersEnum.nextElement();
// keep only members from this jahiaSite...
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager=
/JahiaDBGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/usermanager/JahiaDBGroup.java&rev=3D19552&=
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
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
DBGroup.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
DBGroup.java Mon Jan 21 10:58:03 2008
@@ -34,6 +34,7 @@
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Hashtable;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
=
@@ -58,11 +59,13 @@
=
/** 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,
+ Hashtable members, Properties properties) throws JahiaExceptio=
n {
+ this(id, groupname, groupKey, siteID, members, properties,
+ members !=3D null && !members.isEmpty() ? true : false);
+ } =
+ =
//--------------------------------------------------------------------=
-----
/**
* Instanciate a new JahiaDBGroup object.
@@ -78,7 +81,7 @@
* @param preloadedGroups
*/
protected JahiaDBGroup (int id, String groupname, String groupKey, int=
siteID,
- Hashtable members, Properties properties, bool=
ean preloadedGroups)
+ Hashtable members, Properties properties, boolean preloadedGro=
ups)
throws JahiaException {
ServicesRegistry registry =3D ServicesRegistry.getInstance ();
if (registry =3D=3D null) {
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager=
/JahiaGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/usermanager/JahiaGroup.java&rev=3D19552&re=
pname=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
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
Group.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
Group.java Mon Jan 21 10:58:03 2008
@@ -69,6 +69,7 @@
import java.security.Principal;
import java.security.acl.Group;
import java.util.*;
+
import org.jahia.exceptions.*;
=
/**
@@ -109,6 +110,9 @@
/** Hashtable holding all the group members. Is assumed to be never nu=
ll. */
protected Hashtable mMembers =3D new Hashtable ();
=
+ protected boolean preloadedGroups;
+
+ protected Set notMembers =3D new HashSet(); =
=
/**
* Get grp's properties list.
@@ -446,4 +450,7 @@
*/
public abstract String getProviderName ();
=
+ public boolean isPreloadedGroups() {
+ return preloadedGroups;
+ } =
}
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager=
/JahiaGroupManagerDBProvider.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/usermanager/JahiaGroupManagerDBProvider.ja=
va&rev=3D19552&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
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
GroupManagerDBProvider.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
GroupManagerDBProvider.java Mon Jan 21 10:58:03 2008
@@ -1063,7 +1063,7 @@
=
=
//--------------------------------------------------------------------=
------
- private Hashtable getGroupMembers (String groupKey) {
+ public Hashtable getGroupMembers (String groupKey) {
Hashtable members =3D null;
=
// Get a database connection
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager=
/JahiaLDAPGroup.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/usermanager/JahiaLDAPGroup.java&rev=3D1955=
2&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
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
LDAPGroup.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
LDAPGroup.java Mon Jan 21 10:58:03 2008
@@ -41,11 +41,6 @@
// LDAP dynamic group (groupOfURLs)
private boolean dynamic;
=
- private boolean preloadedGroups;
-
- 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
