Author: michiel
Date: 2010-03-26 16:57:39 +0100 (Fri, 26 Mar 2010)
New Revision: 41635

Added:
   
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
   
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/related.tagx
Removed:
   
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
Log:
renamed tag block -> related and made block tag wrap os:cache

Deleted: 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
===================================================================
--- 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
 2010-03-26 14:50:03 UTC (rev 41634)
+++ 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
 2010-03-26 15:57:39 UTC (rev 41635)
@@ -1,22 +0,0 @@
-<jsp:root
-    xmlns:jsp="http://java.sun.com/JSP/Page";
-    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
-    xmlns:c="http://java.sun.com/jsp/jstl/core";
-    version="2.0"
-    >
-  <jsp:directive.tag
-      description="Using the x/y of the given blockposrel, it determins the 
related (Using 'cartesianrel') content to the current (_node), and iterates 
those." />
-  <jsp:directive.attribute name="blockposrel"        type="java.lang.Object"  
required="true"
-                           description="The blockposrel to be used (e.g. 
provided by portal:blocks)" />
-  <jsp:directive.attribute name="type"        type="java.lang.String"
-                           description="The object type of the related object 
to be searched. This defaults to 'object'." />
-
-  <mm:node id="pos" referid="blockposrel" />
-  <mm:relatednodescontainer role="cartesianrel" type="${empty type ? 'object' 
: type}">
-    <mm:constraint field="cartesianrel.x" value="${pos.x}" />
-    <mm:constraint field="cartesianrel.y" value="${pos.y}" />
-    <mm:relatednodes>
-      <jsp:doBody />
-    </mm:relatednodes>
-  </mm:relatednodescontainer>
-</jsp:root>

Added: 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
===================================================================
--- 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
                         (rev 0)
+++ 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx
 2010-03-26 15:57:39 UTC (rev 41635)
@@ -0,0 +1,30 @@
+<jsp:root
+    xmlns:jsp="http://java.sun.com/JSP/Page";
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+    xmlns:c="http://java.sun.com/jsp/jstl/core";
+    xmlns:os="http://www.opensymphony.com/oscache";
+    version="2.0"
+    >
+  <jsp:directive.tag
+      description="oscache wrapper for one block" />
+
+  <jsp:directive.attribute name="flushparam"        type="java.lang.String"  />
+  <jsp:directive.attribute name="group"        type="java.lang.String"  
required="true" />
+  <os:cache
+      refreshpolicyclass="${block.refreshpolicy}"
+      refreshpolicyparam="${block.refreshpolicyparam}"
+      refresh="${param.flush eq blockposrel.number}"
+      scope="application"
+      key="${group}/${blockposrel}"
+      groups="${group}"
+      >
+    <c:catch var="e">
+      <jsp:doBody />
+    </c:catch>
+    <c:if test="${! empty e}">
+      <mm:log>${e}</mm:log>
+      <div class="error"><mm:write value="${e}" /></div>
+      <os:usecached />
+    </c:if>
+  </os:cache>
+</jsp:root>

Copied: 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/related.tagx
 (from rev 41624, 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx)
===================================================================
--- 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/related.tagx
                               (rev 0)
+++ 
speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/related.tagx
       2010-03-26 15:57:39 UTC (rev 41635)
@@ -0,0 +1,22 @@
+<jsp:root
+    xmlns:jsp="http://java.sun.com/JSP/Page";
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+    xmlns:c="http://java.sun.com/jsp/jstl/core";
+    version="2.0"
+    >
+  <jsp:directive.tag
+      description="Using the x/y of the given blockposrel, it determins the 
related (Using 'cartesianrel') content to the current (_node), and iterates 
those. This is meant to be used in the implementation of a block." />
+  <jsp:directive.attribute name="blockposrel"        type="java.lang.Object"  
required="true"
+                           description="The blockposrel to be used (e.g. 
provided by portal:blocks)" />
+  <jsp:directive.attribute name="type"        type="java.lang.String"
+                           description="The object type of the related object 
to be searched. This defaults to 'object'." />
+
+  <mm:node id="pos" referid="blockposrel" />
+  <mm:relatednodescontainer role="cartesianrel" type="${empty type ? 'object' 
: type}">
+    <mm:constraint field="cartesianrel.x" value="${pos.x}" />
+    <mm:constraint field="cartesianrel.y" value="${pos.y}" />
+    <mm:relatednodes>
+      <jsp:doBody />
+    </mm:relatednodes>
+  </mm:relatednodescontainer>
+</jsp:root>

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to