Author: tdraier
Date: Fri Sep 21 16:44:27 2007
New Revision: 18624
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18624&repname=
=3Djahia
Log:
fixed cache=3D"off" behaviour, added containercache/off and containercache=
/debug parameter
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce=
ssingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D18624&r=
epname=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-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java Fri Sep 21 16:44:27 2007
@@ -154,6 +154,7 @@
=
public static final String OPERATION_MODE_PARAMETER =3D "op";
public static final String CACHE_MODE_PARAMETER =3D "cache";
+ public static final String CONTAINERCACHE_MODE_PARAMETER =3D "containe=
rcache";
public static final String ENTRY_STATE_PARAMETER =3D "entrystate";
public static final String SHOW_REVISION_DIFF_PARAMETER =3D "showrevdi=
ff";
public static final String VALIDATE_PARAMETER =3D "validate";
@@ -1449,6 +1450,7 @@
|| ProcessingContext.STEAL_LOCK.equals(str)
|| ProcessingContext.TEMPLATE_PARAMETER.equals(str)
|| ProcessingContext.CACHE_MODE_PARAMETER.equals(str)
+ || ProcessingContext.CONTAINERCACHE_MODE_PARAMETER.equals(=
str)
|| JesiConst.ESI_MARKER.equals(str))
return true;
else if (isContainerScroll(str) =3D=3D true)
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/cont=
ainer/ContainerCacheTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerCacheTag.java&re=
v=3D18624&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-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java Fri Sep 21 16:44:27 2007
@@ -48,7 +48,9 @@
private String containerContent =3D null;
private int counter =3D 1;
private JahiaData jData =3D null;
- private String cache;
+ private String cache =3D Boolean.toString(Jahia.getSettings().isOutput=
ContainerCacheActivated());
+ private boolean currentCache;
+ private boolean debug =3D false;
private String cacheKey =3D null;
private String cacheKeyName =3D null;
private String cacheKeyProperty =3D null;
@@ -154,8 +156,10 @@
return SKIP_BODY;
}
dependencies =3D new HashSet();
- cache =3D Boolean.toString(Jahia.getSettings().isOutputContainerCa=
cheActivated());
- if ("true".equals(cache)) {
+
+ currentCache =3D "true".equals(cache) && !"off".equals(jData.getPr=
ocessingContext().getParameter(ProcessingContext.CONTAINERCACHE_MODE_PARAME=
TER));
+ debug =3D "debug".equals(jData.getProcessingContext().getParameter=
(ProcessingContext.CONTAINERCACHE_MODE_PARAMETER));
+ if (currentCache) {
try {
boolean b =3D putEsiHeader();
containerContent =3D getFromContainerCache(container, jDat=
a, b);
@@ -178,7 +182,7 @@
try {
String content =3D getBodyContent().getString();
if (content !=3D null && content.length() > 0) {
- if ("true".equals(cache)) {
+ if (currentCache) {
writeToContainerCache(container, jData, content);
if (parentTemplate !=3D null && (jData.getProcessi=
ngContext().settings().isEsiCacheActivated() &&
(parentTemplate.getRequestedFragmentBody()=3D=
=3Dnull &&
@@ -193,7 +197,17 @@
"aclGroup:" + this.aclG=
roupFinalKey);
}
}
+ if (debug) {
+ if (currentCache) {
+ getPreviousOut().print("<fieldset><legend alig=
n=3D\"right\">to cache</legend>");
+ } else {
+ getPreviousOut().print("<fieldset><legend alig=
n=3D\"right\">not cache</legend>");
+ }
+ }
getBodyContent().writeOut(getPreviousOut());
+ if (debug) {
+ getPreviousOut().print("</fieldset>");
+ }
}
getBodyContent().clear();
this.counter++;
@@ -213,7 +227,13 @@
// pooling.
if ((this.display) && (containerContent !=3D null && containerCont=
ent.length()>0)) {
try {
+ if (debug) {
+ pageContext.getOut().print("<fieldset><legend align=3D=
\"right\">from cache</legend>");
+ }
pageContext.getOut().print(containerContent);
+ if (debug) {
+ pageContext.getOut().print("</fieldset>");
+ }
if (jData.getProcessingContext().settings().isEsiCacheActi=
vated() &&
(parentTemplate !=3Dnull && requestedFragment =3D=3D c=
ontainer.getID() + 1000 &&
(cacheKey=3D=3Dnull || cacheKey.equals(((HttpServletRe=
quest)pageContext.getRequest()).getParameter("cachekey")))))
@@ -277,7 +297,7 @@
}
=
public void disableCache() {
- cache =3D "false";
+ currentCache =3D false;
=
ContainerCache ancestor =3D (ContainerCache) findAncestorWithClass=
(this, ContainerCache.class);
if (ancestor !=3D null)
@@ -295,7 +315,7 @@
GroupCacheKey containerKey =3D containerHTMLCache.computeEntryKeyW=
ithGroups(
jahiaContainer, cacheKey, processingContext.getUser(),
curLanguageCode,
- mode,
+ mode, =
processingContext.getScheme(), dependencies);
containerHTMLCache.put(containerKey, bodyContent);
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/cont=
ainer/ContainerTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerTag.java&rev=3D1=
8624&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-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java Fri Sep 21 16:44:27 2007
@@ -83,6 +83,8 @@
private JahiaData jData =3D null;
private ContainerCache oldCacheTag;
private String cache =3D Boolean.toString(Jahia.getSettings().isOutput=
ContainerCacheActivated());
+ private boolean currentCache =3D false;
+ private boolean debug =3D false;
private String cacheKey =3D "";
private String cacheKeyName =3D null;
private String cacheKeyProperty =3D null;
@@ -116,6 +118,7 @@
=
public void setCache(String cache) {
if (!"true".equals(cache) && !"on".equals(cache)) {
+ this.cache =3D "false";
disableCache();
}
else {
@@ -184,7 +187,9 @@
dependencies =3D new HashSet();
ServletRequest request =3D pageContext.getRequest();
jData =3D (JahiaData) request.getAttribute("org.jahia.data.JahiaDa=
ta");
- if ("true".equals(cache) && jData.getProcessingContext().settings(=
).isEsiCacheActivated()) {
+ currentCache =3D "true".equals(cache) && !"off".equals(jData.getPr=
ocessingContext().getParameter(ProcessingContext.CONTAINERCACHE_MODE_PARAME=
TER));
+ debug =3D "debug".equals(jData.getProcessingContext().getParameter=
(ProcessingContext.CONTAINERCACHE_MODE_PARAMETER));
+ if (currentCache && jData.getProcessingContext().settings().isEsiC=
acheActivated()) {
HttpServletResponse httpResponse =3D ((ParamBean) jData.getPro=
cessingContext()).getRealResponse();
JesiTemplateTag tag =3D
((JesiTemplateTag) pageContext.getAttribute(JesiConst.=
TEMPLATE_IN_USE, PageContext.REQUEST_SCOPE));
@@ -245,14 +250,17 @@
=
ServletRequest request =3D pageContext.getRequest();
jData =3D (JahiaData) request.getAttribute("org.jahia.data.Jah=
iaData");
- if ("true".equals(cache)) {
+ currentCache =3D "true".equals(cache) && !"off".equals(jData.g=
etProcessingContext().getParameter(ProcessingContext.CONTAINERCACHE_MODE_PA=
RAMETER));
+ if (currentCache) {
try {
boolean b =3D putEsiHeader();
String containerContent =3D getFromContainerCache(cont=
ainer, jData, b);
if (containerContent !=3D null) {
if ((this.display)) {
try {
- // out.prin=
t("<fieldset><legend align=3D\"right\">cached</legend>");
+ if (debug) {
+ out.print("<fieldset><legend align=3D\=
"right\">from cache</legend>");
+ }
out.print(containerContent);
if (b && (requestedFragment =3D=3D contain=
er.getID() + 1000 && (cacheKey=3D=3Dnull || cacheKey.equals(((HttpServletRe=
quest)pageContext.getRequest()).getParameter("cachekey")))))
parentTemplate.setRequestedFragmentBod=
y(containerContent);
@@ -260,7 +268,9 @@
storeFragmentInSession((ParamBean) jDa=
ta.getProcessingContext(), containerContent,
"", ""+containe=
r.getID(), "aclGroup:"+this.aclGroupFinalKey);
}
-// out.prin=
t("</fieldset>");
+ if (debug) {
+ out.print("</fieldset>");
+ }
} catch (IOException ioe) {
logger.error("Error displaying container o=
utput", ioe);
throw new JspTagException();
@@ -344,7 +354,7 @@
try {
String content =3D getBodyContent().getString();
if (content !=3D null && content.length() > 0) {
- if ("true".equals(cache)) {
+ if (currentCache) {
writeToContainerCache(container, jData, content);
if (parentTemplate!=3Dnull && (jData.getProcessing=
Context().settings().isEsiCacheActivated() && (parentTemplate.getRequestedF=
ragmentBody()=3D=3Dnull && requestedFragment =3D=3D container.getID() + 100=
0 && (cacheKey=3D=3Dnull || cacheKey.equals(((HttpServletRequest)pageContex=
t.getRequest()).getParameter("cachekey"))))))
parentTemplate.setRequestedFragmentBody(conten=
t);
@@ -356,7 +366,17 @@
"aclGroup:" + this.aclG=
roupFinalKey);
}
}
+ if (debug) {
+ if (currentCache) {
+ getPreviousOut().print("<fieldset><legend alig=
n=3D\"right\">to cache</legend>");
+ } else {
+ getPreviousOut().print("<fieldset><legend alig=
n=3D\"right\">not cache</legend>");
+ }
+ }
getBodyContent().writeOut(getPreviousOut());
+ if (debug) {
+ getPreviousOut().print("</fieldset>");
+ }
}
getBodyContent().clear();
this.counter++;
@@ -458,7 +478,7 @@
}
=
public void disableCache() {
- cache =3D "false";
+ currentCache =3D false;
=
ContainerCache ancestor =3D (ContainerCache) findAncestorWithClass=
(this, ContainerCache.class);
if (ancestor !=3D null) ancestor.disableCache();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
