Author: michiel Date: 2010-03-19 15:49:13 +0100 (Fri, 19 Mar 2010) New Revision: 41541
Added: speeltuin/mihxil/portal/0.2/ speeltuin/mihxil/portal/0.2/src/main/config/builders/core/blocks.xml speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Expires.java speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Never.java Removed: speeltuin/mihxil/portal/0.2/src/main/config/builders/core/blocks.xml speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Expires.java Modified: speeltuin/mihxil/portal/0.2/pom.xml speeltuin/mihxil/portal/0.2/test-webapp/pom.xml speeltuin/mihxil/portal/trunk/pom.xml Log: release 0.2 Copied: speeltuin/mihxil/portal/0.2 (from rev 41538, speeltuin/mihxil/portal/trunk) Modified: speeltuin/mihxil/portal/0.2/pom.xml =================================================================== --- speeltuin/mihxil/portal/trunk/pom.xml 2010-03-19 13:09:33 UTC (rev 41538) +++ speeltuin/mihxil/portal/0.2/pom.xml 2010-03-19 14:49:13 UTC (rev 41541) @@ -9,7 +9,7 @@ <artifactId>mmbase-portal</artifactId> <name>MMBase portal</name> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> <packaging>war</packaging> <description> Deleted: speeltuin/mihxil/portal/0.2/src/main/config/builders/core/blocks.xml =================================================================== --- speeltuin/mihxil/portal/trunk/src/main/config/builders/core/blocks.xml 2010-03-19 13:09:33 UTC (rev 41538) +++ speeltuin/mihxil/portal/0.2/src/main/config/builders/core/blocks.xml 2010-03-19 14:49:13 UTC (rev 41541) @@ -1,100 +0,0 @@ -<?xml version="1.0" ?> -<builder - xmlns="http://www.mmbase.org/xmlns/builder"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.mmbase.org/xmlns/builder http://www.mmbase.org/xmlns/builder.xsd"; - name="blocks" maintainer="mmbase.org" version="1" extends="object"> - <searchage>3000</searchage> - <names> - <singular xml:lang="en">Webblock</singular> - <singular xml:lang="nl">Webblok</singular> - <plural xml:lang="en">Webblocks</plural> - <plural xml:lang="nl">Webblokken</plural> - </names> - - <descriptions> - <description xml:lang="en"> - Building blocks for a (home)page - </description> - <description xml:lang="nl"> - Bouwblokken voor een (home)page - </description> - </descriptions> - - <fieldlist> - <field name="component" state="persistent"> - <gui> - <guiname xml:lang="nl">Component</guiname> - <guiname xml:lang="en">Component</guiname> - <guiname xml:lang="zh">模型</guiname> - </gui> - <datatype base="components" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> - </field> - <field name="name"> - <descriptions> - <description xml:lang="en">Name of the webblock</description> - <description xml:lang="nl">Naam van de webblok</description> - </descriptions> - <gui> - <guiname xml:lang="en">Name</guiname> - <guiname xml:lang="nl">Naam</guiname> - </gui> - <editor> - <positions> - <list>1</list> - </positions> - </editor> - <datatype base="eline" xmlns="http://www.mmbase.org/xmlns/datatypes"; > - <required value="true" /> - <maxLength value="126" /> - </datatype> - </field> - - <field name="description"> - <descriptions> - <description xml:lang="en">Description</description> - <description xml:lang="nl">Omschrijving van een webblock</description> - </descriptions> - - <gui> - <guiname xml:lang="nl">Omschrijving</guiname> - <guiname xml:lang="en">Description</guiname> - </gui> - <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes"; > - <maxLength value="2048" /> - </datatype> - </field> - - <field name="windowstate"> - <gui> - <guiname xml:lang="nl">Weergave</guiname> - <guiname xml:lang="en">Display Type</guiname> - </gui> - <datatype base="windowstate" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> - </field> - <field name="refreshpolicy"> - <gui> - <guiname xml:lang="nl">Cacherefreshpolicy</guiname> - <guiname xml:lang="en">Cache refresh policy</guiname> - </gui> - <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <default value="org.mmbase.portal.refresh.Expires" /> - <enumeration> - <entry value="org.mmbase.portal.refresh.Always" display="always" /> - <entry value="org.mmbase.portal.refresh.Expires" display="expires" /> - </enumeration> - </datatype> - </field> - <field name="refreshpolicyparam"> - <gui> - <guiname xml:lang="nl">Cacherefreshpolicy</guiname> - <guiname xml:lang="en">Cache refresh policy</guiname> - </gui> - <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <default value="3600" /> <!-- 1 hour --> - </datatype> - </field> - - - </fieldlist> -</builder> Copied: speeltuin/mihxil/portal/0.2/src/main/config/builders/core/blocks.xml (from rev 41539, speeltuin/mihxil/portal/trunk/src/main/config/builders/core/blocks.xml) =================================================================== --- speeltuin/mihxil/portal/0.2/src/main/config/builders/core/blocks.xml (rev 0) +++ speeltuin/mihxil/portal/0.2/src/main/config/builders/core/blocks.xml 2010-03-19 14:49:13 UTC (rev 41541) @@ -0,0 +1,101 @@ +<?xml version="1.0" ?> +<builder + xmlns="http://www.mmbase.org/xmlns/builder"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://www.mmbase.org/xmlns/builder http://www.mmbase.org/xmlns/builder.xsd"; + name="blocks" maintainer="mmbase.org" version="1" extends="object"> + <searchage>3000</searchage> + <names> + <singular xml:lang="en">Webblock</singular> + <singular xml:lang="nl">Webblok</singular> + <plural xml:lang="en">Webblocks</plural> + <plural xml:lang="nl">Webblokken</plural> + </names> + + <descriptions> + <description xml:lang="en"> + Building blocks for a (home)page + </description> + <description xml:lang="nl"> + Bouwblokken voor een (home)page + </description> + </descriptions> + + <fieldlist> + <field name="component" state="persistent"> + <gui> + <guiname xml:lang="nl">Component</guiname> + <guiname xml:lang="en">Component</guiname> + <guiname xml:lang="zh">模型</guiname> + </gui> + <datatype base="components" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> + </field> + <field name="name"> + <descriptions> + <description xml:lang="en">Name of the webblock</description> + <description xml:lang="nl">Naam van de webblok</description> + </descriptions> + <gui> + <guiname xml:lang="en">Name</guiname> + <guiname xml:lang="nl">Naam</guiname> + </gui> + <editor> + <positions> + <list>1</list> + </positions> + </editor> + <datatype base="eline" xmlns="http://www.mmbase.org/xmlns/datatypes"; > + <required value="true" /> + <maxLength value="126" /> + </datatype> + </field> + + <field name="description"> + <descriptions> + <description xml:lang="en">Description</description> + <description xml:lang="nl">Omschrijving van een webblock</description> + </descriptions> + + <gui> + <guiname xml:lang="nl">Omschrijving</guiname> + <guiname xml:lang="en">Description</guiname> + </gui> + <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes"; > + <maxLength value="2048" /> + </datatype> + </field> + + <field name="windowstate"> + <gui> + <guiname xml:lang="nl">Weergave</guiname> + <guiname xml:lang="en">Display Type</guiname> + </gui> + <datatype base="windowstate" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> + </field> + <field name="refreshpolicy"> + <gui> + <guiname xml:lang="nl">Cacherefreshpolicy</guiname> + <guiname xml:lang="en">Cache refresh policy</guiname> + </gui> + <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <default value="org.mmbase.portal.refresh.Expires" /> + <enumeration> + <entry value="org.mmbase.portal.refresh.Always" display="always" /> + <entry value="org.mmbase.portal.refresh.Expires" display="expires" /> + <entry value="org.mmbase.portal.refresh.Never" display="never" /> + </enumeration> + </datatype> + </field> + <field name="refreshpolicyparam"> + <gui> + <guiname xml:lang="nl">Cacherefreshpolicy</guiname> + <guiname xml:lang="en">Cache refresh policy</guiname> + </gui> + <datatype base="string" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <default value="3600" /> <!-- 1 hour --> + </datatype> + </field> + + + </fieldlist> +</builder> Deleted: speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Expires.java =================================================================== --- speeltuin/mihxil/portal/trunk/src/main/java/org/mmbase/portal/refresh/Expires.java 2010-03-19 13:09:33 UTC (rev 41538) +++ speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Expires.java 2010-03-19 14:49:13 UTC (rev 41541) @@ -1,31 +0,0 @@ -/* - -This software is OSI Certified Open Source Software. -OSI Certified is a certification mark of the Open Source Initiative. - -The license (Mozilla version 1.0) can be read at the MMBase site. -See http://www.MMBase.org/license - -*/ -package org.mmbase.portal.refresh; - -import java.util.*; -import com.opensymphony.oscache.web.*; -import com.opensymphony.oscache.base.*; - -/** - * @author Michiel Meeuwissen - * @version $Id$ - */ -public class Expires implements WebEntryRefreshPolicy { - - int expires = 600; - - public void init(String key, String param) { - expires = Integer.parseInt(param); - } - public boolean needsRefresh(CacheEntry e) { - long now = System.currentTimeMillis(); - return now > e.getLastUpdate() + expires * 1000; - } -} \ No newline at end of file Copied: speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Expires.java (from rev 41540, speeltuin/mihxil/portal/trunk/src/main/java/org/mmbase/portal/refresh/Expires.java) =================================================================== --- speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Expires.java (rev 0) +++ speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Expires.java 2010-03-19 14:49:13 UTC (rev 41541) @@ -0,0 +1,36 @@ +/* + +This software is OSI Certified Open Source Software. +OSI Certified is a certification mark of the Open Source Initiative. + +The license (Mozilla version 1.0) can be read at the MMBase site. +See http://www.MMBase.org/license + +*/ +package org.mmbase.portal.refresh; + +import java.util.*; +import com.opensymphony.oscache.web.*; +import com.opensymphony.oscache.base.*; + +/** + * Straight-forward refresh policy simply based on a expire time in seconds. Could have used os-cache tags 'time' attribute. But this makes + * it possible to always specify a class. + * + * So this class interprets the refresh 'param' as a time in seconds after which age the block needs a refresh. + * + * @author Michiel Meeuwissen + * @version $Id$ + */ +public class Expires implements WebEntryRefreshPolicy { + + int expires = 3600; // Defaults to one hour + + public void init(String key, String param) { + expires = Integer.parseInt(param); + } + public boolean needsRefresh(CacheEntry e) { + long now = System.currentTimeMillis(); + return now > e.getLastUpdate() + expires * 1000; + } +} \ No newline at end of file Copied: speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Never.java (from rev 41539, speeltuin/mihxil/portal/trunk/src/main/java/org/mmbase/portal/refresh/Never.java) =================================================================== --- speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Never.java (rev 0) +++ speeltuin/mihxil/portal/0.2/src/main/java/org/mmbase/portal/refresh/Never.java 2010-03-19 14:49:13 UTC (rev 41541) @@ -0,0 +1,28 @@ +/* + +This software is OSI Certified Open Source Software. +OSI Certified is a certification mark of the Open Source Initiative. + +The license (Mozilla version 1.0) can be read at the MMBase site. +See http://www.MMBase.org/license + +*/ +package org.mmbase.portal.refresh; + +import java.util.*; +import com.opensymphony.oscache.web.*; +import com.opensymphony.oscache.base.*; + +/** + * @author Michiel Meeuwissen + * @version $Id$ + */ +public class Never implements WebEntryRefreshPolicy { + + public void init(String key, String param) { + + } + public boolean needsRefresh(CacheEntry e) { + return false; + } +} \ No newline at end of file Modified: speeltuin/mihxil/portal/0.2/test-webapp/pom.xml =================================================================== --- speeltuin/mihxil/portal/trunk/test-webapp/pom.xml 2010-03-19 13:09:33 UTC (rev 41538) +++ speeltuin/mihxil/portal/0.2/test-webapp/pom.xml 2010-03-19 14:49:13 UTC (rev 41541) @@ -85,7 +85,7 @@ <dependency> <groupId>org.mmbase</groupId> <artifactId>mmbase-portal</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> <type>war</type> </dependency> <dependency> Modified: speeltuin/mihxil/portal/trunk/pom.xml =================================================================== --- speeltuin/mihxil/portal/trunk/pom.xml 2010-03-19 14:46:28 UTC (rev 41540) +++ speeltuin/mihxil/portal/trunk/pom.xml 2010-03-19 14:49:13 UTC (rev 41541) @@ -9,7 +9,7 @@ <artifactId>mmbase-portal</artifactId> <name>MMBase portal</name> - <version>0.2-SNAPSHOT</version> + <version>0.3-SNAPSHOT</version> <packaging>war</packaging> <description> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
