Author: tdraier
Date: Fri Sep 14 13:28:48 2007
New Revision: 18483
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18483&repname=
=3Djahia
Log:
added htmlContainerOutputCache property to enable/disable html container ca=
che (JAHIA-2205) (port 18327)
Modified:
trunk/core/src/java/org/jahia/settings/SettingsBean.java
trunk/core/src/java/org/jahia/taglibs/container/ContainerCacheTag.java
trunk/core/src/java/org/jahia/taglibs/container/ContainerTag.java
trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
Modified: trunk/core/src/java/org/jahia/settings/SettingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/settings/SettingsBean.java&rev=3D18483&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/settings/SettingsBean.java (original)
+++ trunk/core/src/java/org/jahia/settings/SettingsBean.java Fri Sep 14 13:=
28:48 2007
@@ -208,6 +208,8 @@
private long outputCacheDefaultExpirationDelay;
private boolean outputCacheExpirationOnly =3D false;
=
+ private boolean outputContainerCacheActivated =3D false;
+
// Activation / deactivation of site ID in URLs
private boolean siteIDInURL;
=
@@ -544,6 +546,8 @@
=
outputCacheExpirationOnly =3D getBoolean("outputCacheExpiratio=
nOnly", false);
=
+ outputContainerCacheActivated =3D getBoolean("outputContainerC=
acheActivated", false);
+
// ESI cache activation / deactivation
esiCacheActivated =3DgetBoolean ("esiCacheActivated", false);
if (!LicenseActionChecker.isAuthorizedByLicense("org.jahia.ser=
vices.esi.EsiService", 0)) {
@@ -2223,4 +2227,12 @@
public void setEditModeSessionTimeout(int editModeSessionTimeout) {
this.editModeSessionTimeout =3D editModeSessionTimeout;
}
+
+ public boolean isOutputContainerCacheActivated() {
+ return outputContainerCacheActivated;
+ }
+
+ public void setOutputContainerCacheActivated(boolean outputContainerCa=
cheActivated) {
+ this.outputContainerCacheActivated =3D outputContainerCacheActivat=
ed;
+ }
}
Modified: trunk/core/src/java/org/jahia/taglibs/container/ContainerCacheTag=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/container/ContainerCacheTag.java&rev=3D18483&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/taglibs/container/ContainerCacheTag.java =
(original)
+++ trunk/core/src/java/org/jahia/taglibs/container/ContainerCacheTag.java =
Fri Sep 14 13:28:48 2007
@@ -1,22 +1,23 @@
package org.jahia.taglibs.container;
=
-import org.jahia.data.containers.JahiaContainer;
-import org.jahia.data.containers.JahiaContainerList;
+import org.jahia.bin.Jahia;
+import org.jahia.content.ContentContainerKey;
+import org.jahia.content.ContentContainerListKey;
import org.jahia.data.JahiaData;
import org.jahia.data.beans.ContainerBean;
+import org.jahia.data.containers.JahiaContainer;
+import org.jahia.data.containers.JahiaContainerList;
import org.jahia.exceptions.JahiaInitializationException;
+import org.jahia.params.ProcessingContext;
+import org.jahia.registries.ServicesRegistry;
import org.jahia.services.cache.ContainerHTMLCache;
import org.jahia.services.cache.GroupCacheKey;
-import org.jahia.registries.ServicesRegistry;
-import org.jahia.params.ProcessingContext;
import org.jahia.utils.LanguageCodeConverters;
-import org.jahia.content.ContentContainerListKey;
-import org.jahia.content.ContentContainerKey;
=
+import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.ServletRequest;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
@@ -37,7 +38,7 @@
private String containerContent =3D null;
private int counter =3D 1;
private JahiaData jData =3D null;
- private String cache =3D "true";
+ private String cache;
private String cacheKey =3D null;
private Set dependencies =3D null;
private ContainerCache oldCacheTag;
@@ -96,6 +97,7 @@
dependencies =3D new HashSet();
ServletRequest request =3D pageContext.getRequest();
jData =3D (JahiaData) request.getAttribute("org.jahia.data.JahiaDa=
ta");
+ cache =3D Boolean.toString(Jahia.getSettings().isOutputContainerCa=
cheActivated());
if ("true".equals(cache)) {
try {
containerContent =3D getFromContainerCache(container, jDat=
a);
@@ -153,7 +155,7 @@
jData =3D null;
dependencies =3D null;
display =3D true;
-
+ cache =3D Boolean.toString(Jahia.getSettings().isOutputContainerCa=
cheActivated());
pageContext.setAttribute(ContainerTag.CACHETAG, oldCacheTag);
oldCacheTag =3D null;
=
Modified: trunk/core/src/java/org/jahia/taglibs/container/ContainerTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/container/ContainerTag.java&rev=3D18483&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/container/ContainerTag.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/taglibs/container/ContainerTag.java Fri S=
ep 14 13:28:48 2007
@@ -75,7 +75,7 @@
private int counter =3D 1;
private JahiaData jData =3D null;
private ContainerCache oldCacheTag;
- private String cache =3D CACHING_DEFAULT_VALUE;
+ private String cache =3D Boolean.toString(Jahia.getSettings().isOutput=
ContainerCacheActivated());
private String cacheKey =3D "";
=
private boolean initLoop =3D true;
@@ -258,7 +258,7 @@
firstContainer =3D null;
counter =3D 1;
dependencies =3D null;
- cache =3D CACHING_DEFAULT_VALUE;
+ cache =3D Boolean.toString(Jahia.getSettings().isOutputContainerCa=
cheActivated());
=
cacheKey =3D "";
=
Modified: trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/config/jahia.skeleton&rev=3D18483&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/webapp/WEB-INF/etc/config/jahia.skeleton (original)
+++ trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton Fri Sep 14 13:2=
8:48 2007
@@ -213,6 +213,11 @@
outputCacheExpirationOnly =3D false
=
######################################################################
+### HTML Container Output cache #####################################
+######################################################################
+outputContainerCacheActivated =3D true
+
+######################################################################
### ESI fragment-based Output cache #################################
######################################################################
# Note that the above conventional cache must be deactivated
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
