Author: cmailleux
Date: Thu Jul 12 17:52:29 2007
New Revision: 17972
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17972&repname=
=3Djahia
Log:
Port of commit [17257] Resolve issue JAHIA-1670
Modified:
trunk/core/src/java/org/jahia/admin/users/ManageGroups.java
trunk/core/src/java/org/jahia/data/events/JahiaEventListener.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=3D17972&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 Thu Jul 12 =
17:52:29 2007
@@ -54,13 +54,9 @@
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.sites.JahiaSitesService;
-import org.jahia.services.usermanager.JahiaDBUser;
-import org.jahia.services.usermanager.JahiaGroup;
-import org.jahia.services.usermanager.JahiaGroupManagerService;
-import org.jahia.services.usermanager.JahiaSiteGroupManagerService;
-import org.jahia.services.usermanager.JahiaUser;
-import org.jahia.services.usermanager.JahiaUserManagerService;
+import org.jahia.services.usermanager.*;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.cache.HtmlCache;
import org.jahia.utils.JahiaTools;
import org.jahia.utils.LanguageCodeConverters;
=
@@ -516,16 +512,16 @@
candidateMembers.add(usr);
}
}
-
+ HtmlCache htmlCache =3D ServicesRegistry.getInstance().getCacheSer=
vice().getHtmlCacheInstance();
// Update group members
if (candidateMembers.size() > 0) {
try { // FIXME : Is here a way to optmize these pointer to met=
hod ?
// Is there any new members to the original groupMembers
addRemoveGroupMembers(groupMembers, candidateMembers,
- JahiaGroup.class.getMethod("addMember", new Class[] {Princ=
ipal.class}), grp);
+ JahiaGroup.class.getMethod("addMember", new Class[] {Princ=
ipal.class}), grp,htmlCache);
// Is there any removed members from the original groupMembers
addRemoveGroupMembers(candidateMembers, groupMembers,
- JahiaGroup.class.getMethod("removeMember", new Class[] {Pr=
incipal.class}), grp);
+ JahiaGroup.class.getMethod("removeMember", new Class[] {Pr=
incipal.class}), grp,htmlCache);
} catch (NoSuchMethodException nsme) {
logger.debug("Error ", nsme);
}
@@ -533,7 +529,9 @@
// No member in the select box, all members have to be removed
Iterator it =3D groupMembers.iterator();
while (it.hasNext()) {
- grp.removeMember((JahiaUser)it.next());
+ JahiaUser jahiaUser =3D (JahiaUser) it.next();
+ grp.removeMember(jahiaUser);
+ htmlCache.invalidateUserEntries(jahiaUser.getUsername());
}
}
groupMessage =3D JahiaResourceBundle.getAdminResource("org.jahia.a=
dmin.groupMessage.group.label",
@@ -542,10 +540,10 @@
groupMessage +=3D JahiaResourceBundle.getAdminResource("org.jahia.=
admin.groupMessage.updated.label",
jParams, jParams.getLocale());
=
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/03/2006 =
- Begin
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina - added=
28/03/2006 - Begin
JahiaEvent je =3D new JahiaEvent(this, jParams, grp);
JahiaEventGeneratorBaseService.getInstance().fireUpdateGroup(je);
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/03/2006 =
- End
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina - added=
28/03/2006 - End
=
return true;
}
@@ -789,14 +787,14 @@
groupMessage +=3D JahiaResourceBundle.getAdminResource("org.=
jahia.admin.groupMessage.removed.label",
jParams, jParams.getLocale());
=
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/03=
/2006 - Begin
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina -=
added 28/03/2006 - Begin
try {
JahiaEvent je =3D new JahiaEvent(this, jParams, theGroup=
);
JahiaEventGeneratorBaseService.getInstance().fireDeleteG=
roup(je);
} catch (JahiaException e1) {
e1.printStackTrace();
}
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/03=
/2006 - End
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina -=
added 28/03/2006 - End
=
}
}
@@ -824,14 +822,14 @@
ServicesRegistry.getInstance().getJahiaSiteGroupManage=
rService();
siteGroupManager.addGroup(jahiaSite.getID(), theGroup);
=
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/=
03/2006 - Begin
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina=
- added 28/03/2006 - Begin
try {
JahiaEvent je =3D new JahiaEvent(this, jParams, theGro=
up);
JahiaEventGeneratorBaseService.getInstance().fireAddGr=
oup(je);
} catch (JahiaException e1) {
e1.printStackTrace();
}
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/=
03/2006 - End
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina=
- added 28/03/2006 - End
} catch (Exception e) { }
}
return theGroup;
@@ -928,7 +926,7 @@
* @param addRem the addMembers or removeMembers method to apply.
* @param grp the object defining the previous method
*/
- private void addRemoveGroupMembers(HashSet left, HashSet right, Method=
addRem, JahiaGroup grp) {
+ private void addRemoveGroupMembers(HashSet left, HashSet right, Method=
addRem, JahiaGroup grp, HtmlCache cache) {
Iterator itRight =3D right.iterator();
while (itRight.hasNext()) {
JahiaUser elementRight =3D (JahiaUser)itRight.next();
@@ -944,6 +942,7 @@
try {
Object[] args =3D { elementRight };
addRem.invoke(grp, args);
+ cache.invalidateUserEntries(elementRight.getUsername()=
);
} catch (IllegalAccessException iae) {
logger.error("Error ", iae);
} catch (InvocationTargetException ite) {
Modified: trunk/core/src/java/org/jahia/data/events/JahiaEventListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/events/JahiaEventListener.java&rev=3D17972&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/data/events/JahiaEventListener.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/data/events/JahiaEventListener.java Thu J=
ul 12 17:52:29 2007
@@ -28,6 +28,7 @@
import org.jahia.content.events.ContentUndoStagingEvent;
import org.jahia.content.events.ContentObjectDeleteEvent;
import org.jahia.content.events.ContentObjectRestoreVersionEvent;
+import org.jahia.registries.ServicesRegistry;
=
=
public class JahiaEventListener implements JahiaEventListenerInterface
@@ -143,7 +144,7 @@
=
public void flushEsiCacheEvent(JahiaEvent theEvent){ return; }
=
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/03/2006 - Be=
gin
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina - added 28/=
03/2006 - Begin
public void pageDeleted( JahiaEvent je) { return; }
public void pageAccepted( JahiaEvent je) { return; }
public void pageRejected( JahiaEvent je) { return; }
@@ -154,7 +155,11 @@
public void userUpdated( JahiaEvent je ) { return; }
public void groupAdded( JahiaEvent je ) { return; }
public void groupDeleted( JahiaEvent je ) { return; }
- public void groupUpdated( JahiaEvent je ) { return; }
- // Nicol=C3=A1s Charczewski - Neoris Argentina - added 28/03/2006 - End
+ public void groupUpdated( JahiaEvent je ) {
+ ServicesRegistry servicesRegistry =3D ServicesRegistry.getInstance=
();
+ servicesRegistry.getJahiaACLManagerService().flushCache();
+ =
+ }
+ // Nicol=C3=AF=C2=BF=C2=BDs Charczewski - Neoris Argentina - added 28/=
03/2006 - End
=
} // end JahiaEventListener
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
