Author: tdraier
Date: Fri Aug 31 15:09:03 2007
New Revision: 18327
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18327&repname=
=3Djahia
Log:
added htmlContainerOutputCache property to enable/disable html container ca=
che (JAHIA-2205)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.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
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.s=
keleton
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/Set=
tingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/settings/SettingsBean.java&rev=3D18327&repn=
ame=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/settings/SettingsB=
ean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/settings/SettingsB=
ean.java Fri Aug 31 15:09:03 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;
=
@@ -533,6 +535,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)) {
@@ -2120,4 +2124,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: 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=3D18327&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 Aug 31 15:09:03 2007
@@ -48,7 +48,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;
@@ -123,6 +123,7 @@
return SKIP_BODY;
}
dependencies =3D new HashSet();
+ cache =3D Boolean.toString(Jahia.getSettings().isOutputContainerCa=
cheActivated());
if ("true".equals(cache)) {
try {
boolean b =3D putEsiHeader();
@@ -193,7 +194,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: 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=
8327&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 Aug 31 15:09:03 2007
@@ -81,7 +81,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;
@@ -336,7 +336,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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/j=
ahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.skeleton&rev=3D18327&repna=
me=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/webapp/WEB-INF/etc/config/jahia.s=
keleton (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/jahia.s=
keleton Fri Aug 31 15:09:03 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
