Author: cmailleux
Date: Thu Jul 12 17:00:53 2007
New Revision: 17968
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17968&repname=
=3Djahia
Log:
Port of commit [17023] Resolve issue ESI-291
Modified:
trunk/core/src/java/org/jahia/bin/JahiaWebAppListener.java
trunk/core/src/java/org/jahia/services/esi/EsiInvalidationWriterService=
.java
trunk/core/src/java/org/jahia/services/esi/EsiSOAPInvalidatorService.ja=
va
trunk/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java
Modified: trunk/core/src/java/org/jahia/bin/JahiaWebAppListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaWebAppListener.java&rev=3D17968&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/bin/JahiaWebAppListener.java (original)
+++ trunk/core/src/java/org/jahia/bin/JahiaWebAppListener.java Thu Jul 12 1=
7:00:53 2007
@@ -86,6 +86,9 @@
if (u !=3D null) {
servReg.getLockService().purgeLockForContext(u.getUserKey(=
));
}
+ if(Jahia.getSettings().isEsiCacheActivated()) {
+ servReg.getEsiSOAPInvalidatorService().SOAPInvalidateUserS=
ession(se.getSession().getId(),u);
+ }
}
}
}
Modified: trunk/core/src/java/org/jahia/services/esi/EsiInvalidationWriterS=
ervice.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/esi/EsiInvalidationWriterService.java&rev=3D17968&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/esi/EsiInvalidationWriterService=
.java (original)
+++ trunk/core/src/java/org/jahia/services/esi/EsiInvalidationWriterService=
.java Thu Jul 12 17:00:53 2007
@@ -1302,6 +1302,20 @@
}
=
=
+ public String getHeaderBasedUserSessionInvalidationString(String sessi=
onID, JahiaUser user) {
+ //TODO: will invalidate entries shared with others,
+ //TODO: but also might not invalidate entries generated by other b=
ut used by the current user
+
+ StringBuffer str =3D new StringBuffer("");
+
+ str.append("<OBJECT> \n");
+ str.append("<INFO VALUE=3D\"remove-User-session-for-")
+ .append(ServicesRegistry.getInstance().getEsiURLGeneratorS=
ervice().encodeUsername(user))
+ .append("$$$" + sessionID + "\"/> \n");
+ str.append("</OBJECT> \n");
+
+ return str.toString();
+ }
}
=
=
Modified: trunk/core/src/java/org/jahia/services/esi/EsiSOAPInvalidatorServ=
ice.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/esi/EsiSOAPInvalidatorService.java&rev=3D17968&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/esi/EsiSOAPInvalidatorService.ja=
va (original)
+++ trunk/core/src/java/org/jahia/services/esi/EsiSOAPInvalidatorService.ja=
va Thu Jul 12 17:00:53 2007
@@ -531,7 +531,27 @@
=
}
=
- =
+ /**
+ * invalidate all templates/fragments generated for a given set of use=
rs.
+ *
+ * (for more details : @see #SOAPInvalidateAllUserEntries)
+ *
+ * @param pc Current ProcessingContext object (i.e. ParamBean)
+ * @param users Set of JahiaUser objects where each JahiaUser holds th=
e user for which the entries are to be invalidated
+ * @return true if successful SOAP invalidation
+ */
+ public boolean SOAPInvalidateUserSession(String sessionID, JahiaUser u=
ser) {
+ //TODO: need to support invalidation of user Session on ESI server=
, when using aclGrouped shared templates
+ String invMessage =3D ServicesRegistry.getInstance().getEsiInvalid=
ationWriterService()
+ .getHeaderBasedUserSessionInvalidationString (sessionID,us=
er);
+ if (invMessage!=3Dnull) {
+ String soapRequest =3D ServicesRegistry.getInstance().getEsiIn=
validationWriterService().addSOAPXMLWrapper(invMessage);
+ if (logger.isDebugEnabled())
+ logger.debug("[esi]: SOAP Invalidation Message SOAPInvali=
dateAllUserEntries : \n" + soapRequest );
+ return Transmit(soapRequest);
+ }
+ return false; //nothing to invalidate
+ }
}
=
=
Modified: trunk/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/esi/JesiFragmentTag.java&rev=3D17968&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/taglibs/esi/JesiFragmentTag.java (origina=
l)
+++ trunk/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java Thu Jul =
12 17:00:53 2007
@@ -741,6 +741,7 @@
}
}
catch( IOException excep ) {
+ logger.error(excep);
release();
throw new JspTagException( excep.toString() ); }
//otherwise, if a fragmentBody is already stored in th=
e session, just return it
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
