svn commit: [jahia] r18634 - in /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/field: AbstractFieldTag.java ApplicationFieldTag.java

[tdraier]

Author: tdraier
Date: Mon Sep 24 15:58:14 2007
New Revision: 18634

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18634&repname=
=3Djahia
Log:
disable container cache for portlets (PORTAL-134)

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/field/Abst=
ractFieldTag.java
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/field/Appl=
icationFieldTag.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/fiel=
d/AbstractFieldTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/field/AbstractFieldTag.java&rev=3D1=
8634&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/field/Abst=
ractFieldTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/field/Abst=
ractFieldTag.java Mon Sep 24 15:58:14 2007
@@ -22,11 +22,10 @@
 import org.jahia.data.JahiaData;
 import org.jahia.data.beans.FieldBean;
 import org.jahia.data.containers.JahiaContainer;
-import org.jahia.data.containers.JahiaContainerDefinition;
 import org.jahia.data.fields.JahiaField;
 import org.jahia.exceptions.JahiaException;
-import org.jahia.registries.ServicesRegistry;
 import org.jahia.spring.aop.interceptor.SilentJamonPerformanceMonitorInter=
ceptor;
+import org.jahia.taglibs.container.ContainerCache;
 import org.jahia.taglibs.container.ContainerListTag;
 import org.jahia.taglibs.container.ContainerTag;
 =

@@ -66,7 +65,7 @@
     private int pageLevel =3D -1;
     private boolean diffActive =3D false;
     private String defaultValue =3D null;
-    private String fieldValue =3D null;
+    protected String fieldValue =3D null;
     private String valueId =3D null;
 =

     private static final Logger monitorLogger =3D Logger.getLogger(SilentJ=
amonPerformanceMonitorInterceptor.class);

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/fiel=
d/ApplicationFieldTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/field/ApplicationFieldTag.java&rev=
=3D18634&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/field/Appl=
icationFieldTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/field/Appl=
icationFieldTag.java Mon Sep 24 15:58:14 2007
@@ -17,6 +17,9 @@
  */package org.jahia.taglibs.field;
 =

 import org.jahia.data.fields.FieldTypes;
+import org.jahia.taglibs.container.ContainerCache;
+
+import javax.servlet.jsp.JspTagException;
 =

 /**
  * Class ApplicationFieldTag : displays a Web Application
@@ -54,4 +57,18 @@
         return FieldTypes.APPLICATION;
     }
 =

+    public int doStartTag() throws JspTagException {
+
+        int r =3D super.doStartTag();
+
+        if (fieldValue !=3D null && !fieldValue.equals("")) {
+            ContainerCache cacheTag =3D (ContainerCache) findAncestorWithC=
lass(this, ContainerCache.class);
+            if (cacheTag !=3D null) {
+                cacheTag.disableCache();
+            }
+        }
+
+        return r;
+
+    }
 }

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list