Author: michiel Date: 2010-03-26 17:25:29 +0100 (Fri, 26 Mar 2010) New Revision: 41641
Added: speeltuin/mihxil/portal/0.3/ speeltuin/mihxil/portal/0.3/src/main/config/builders/portal/pages.xml speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/mmbase-portal.tld speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/tags/mm/portal/block.tagx speeltuin/mihxil/portal/0.3/test-webapp/pom.xml speeltuin/mihxil/portal/0.3/test-webapp/src/main/webapp/edit/page/index.jspx Removed: speeltuin/mihxil/portal/0.3/src/main/config/builders/portal/pages.xml speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/mmbase-portal.tld speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/tags/mm/portal/block.tagx speeltuin/mihxil/portal/0.3/test-webapp/pom.xml speeltuin/mihxil/portal/0.3/test-webapp/src/main/webapp/edit/page/index.jspx Modified: speeltuin/mihxil/portal/0.3/pom.xml Log: released portal 0.3 Copied: speeltuin/mihxil/portal/0.3 (from rev 41635, speeltuin/mihxil/portal/trunk) Modified: speeltuin/mihxil/portal/0.3/pom.xml =================================================================== --- speeltuin/mihxil/portal/trunk/pom.xml 2010-03-26 15:57:39 UTC (rev 41635) +++ speeltuin/mihxil/portal/0.3/pom.xml 2010-03-26 16:25:29 UTC (rev 41641) @@ -9,7 +9,7 @@ <artifactId>mmbase-portal</artifactId> <name>MMBase portal</name> - <version>0.3-SNAPSHOT</version> + <version>0.3</version> <packaging>war</packaging> <description> Deleted: speeltuin/mihxil/portal/0.3/src/main/config/builders/portal/pages.xml =================================================================== --- speeltuin/mihxil/portal/trunk/src/main/config/builders/portal/pages.xml 2010-03-26 15:57:39 UTC (rev 41635) +++ speeltuin/mihxil/portal/0.3/src/main/config/builders/portal/pages.xml 2010-03-26 16:25:29 UTC (rev 41641) @@ -1,292 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<builder - xmlns="http://www.mmbase.org/xmlns/builder"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:xi="http://www.w3.org/2001/XInclude"; - xsi:schemaLocation="http://www.mmbase.org/xmlns/builder - http://www.mmbase.org/xmlns/builder.xsd"; - name="pages" maintainer="mmbase.org" version="0" extends="object"> - <searchage>3000</searchage> - <names> - <singular xml:lang="en">Page</singular> - <singular xml:lang="nl">Pagina</singular> - <plural xml:lang="en">Pages</plural> - <plural xml:lang="nl">Pagina's</plural> - </names> - <descriptions> - <description xml:lang="en">A page in a website</description> - <description xml:lang="nl">Een pagina in een website</description> - </descriptions> - <properties /> - <fieldlist> - - <field name="title"> - <descriptions> - <description xml:lang="en">The title, also pagetitle</description> - <description xml:lang="nl">De titel, tevens titel van de pagina</description> - </descriptions> - <gui> - <guiname xml:lang="en">Title</guiname> - <guiname xml:lang="nl">Titel</guiname> - </gui> - <editor> - <positions> - <input>1</input> - <list>1</list> - <search>1</search> - </positions> - </editor> - <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <required value="true"> - <description xml:lang="nl">Titel is een verplicht veld</description> - <description xml:lang="en">A title is required</description> - </required> - <maxLength value="255" /> - </datatype> - </field> - - <field name="path"> - <descriptions> - <description xml:lang="en">Path from root of site, like '/en/about'</description> - <description xml:lang="nl">Pad vanaf de root van de site, bijvoorbeeld '/over/ons'</description> - </descriptions> - <gui> - <guiname xml:lang="en">Path</guiname> - <guiname xml:lang="nl">Pad</guiname> - </gui> - <editor> - <positions> - <input>2</input> - <list>2</list> - <search>2</search> - </positions> - </editor> - <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <default value="/" /> - <required value="true"> - <description xml:lang="nl">Pad is een verplicht veld</description> - <description xml:lang="en">A path is required field</description> - </required> - <maxLength value="255" /> - </datatype> - </field> - - <!-- - <field name="template"> - <descriptions> - <description xml:lang="nl">Template voor de pagina</description> - <description xml:lang="en">Page template to use</description> - </descriptions> - <gui> - <guiname xml:lang="en">Template</guiname> - <guiname xml:lang="nl">Template</guiname> - </gui> - <editor> - <positions> - <input>4</input> - <search>4</search> - </positions> - </editor> - <datatype xmlns="http://www.mmbase.org/xmlns/datatypes"; base="templates"> - <default value="template_content" /> - </datatype> - </field> - --> - <field name="description"> - <descriptions> - <description xml:lang="en">Short description of the page.</description> - <description xml:lang="nl">Korte beschrijving van de pagina.</description> - </descriptions> - <gui> - <guiname xml:lang="en">Description</guiname> - <guiname xml:lang="nl">Beschrijving</guiname> - </gui> - <editor> - <positions> - <input>5</input> - <search>5</search> - </positions> - </editor> - <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <maxLength value="1024" /> - </datatype> - </field> - - <field name="expires"> - <descriptions> - <description xml:lang="en">When this page expires, in seconds after it was first viewed (expires response header).</description> - <description xml:lang="nl">Houdbaarheidstijd van de pagina in seconden (expires response header).</description> - </descriptions> - <gui> - <guiname xml:lang="en">Expires</guiname> - <guiname xml:lang="nl">Expires</guiname> - </gui> - <editor> - <positions> - <input>9</input> - <search>9</search> - </positions> - </editor> - <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <default value="60" /> - </datatype> - </field> - - - <!-- COPIED FROM http://www.mmbase.org/builders/mmsite/content.meta.fields.xml - Just to maintain MMBase-1.8 and Non-xinclude capable xml-parsers compatibility. - --> - - <field name="show"> - <descriptions> - <description xml:lang="nl">Of dit item getoond moet worden</description> - <description xml:lang="en">Whether to show this item</description> - </descriptions> - <gui> - <guiname xml:lang="nl">Tonen</guiname> - <guiname xml:lang="en">Show</guiname> - </gui> - <editor> - <positions> - <input>92</input> - <list>92</list> - <search>92</search> - </positions> - </editor> - <datatype xmlns="http://www.mmbase.org/xmlns/datatypes"; base="onoff"> - <default value="true" /> - </datatype> - </field> - - <field name="online"> - <descriptions> - <description xml:lang="nl">Datum en tijd waarop het getoond moet worden</description> - <description xml:lang="en">Date and time to display this item</description> - </descriptions> - <gui> - <guiname xml:lang="nl">On-line op</guiname> - <guiname xml:lang="en">Online on</guiname> - </gui> - <editor> - <positions> - <input>93</input> - <list>-1</list> - <search>93</search> - </positions> - </editor> - <datatype base="datetime" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <default value="today" /> - <minInclusive enforce="never" value="today - 10 year" /> - <maxInclusive enforce="never" value="today + 99 year" /> - </datatype> - </field> - - <field name="offline"> - <descriptions> - <description xml:lang="nl">Datum en tijd waarop het niet meer getoond moet worden</description> - <description xml:lang="en">Date and time to end displaying this item</description> - </descriptions> - <gui> - <guiname xml:lang="nl">Off-line op</guiname> - <guiname xml:lang="en">Offline on</guiname> - </gui> - <editor> - <positions> - <input>93</input> - <list>-1</list> - <search>93</search> - </positions> - </editor> - <datatype base="datetime" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <default value="today + 100 year" /> - <minInclusive enforce="never" value="today - 10 year" /> - <maxInclusive enforce="never" value="today + 200 year" /> - </datatype> - </field> - - <field name="created" readonly="true" state="system"> - <descriptions> - <description xml:lang="en">Creation date of this item</description> - <description xml:lang="nl">Creatiedatum van het item</description> - </descriptions> - <gui> - <guiname xml:lang="en">Created</guiname> - <guiname xml:lang="nl">Aangemaakt</guiname> - </gui> - <editor> - <positions> - <input>96</input> - <search>96</search> - </positions> - </editor> - <datatype base="created" xmlns="http://www.mmbase.org/xmlns/datatypes";> - <default value="now" /> - </datatype> - </field> - - <field name="creator" readonly="true" state="system"> - <descriptions> - <description xml:lang="en">User that created this item</description> - <description xml:lang="nl">De gebruiker die dit item aanmaakte</description> - </descriptions> - <gui> - <guiname xml:lang="en">Creator</guiname> - <guiname xml:lang="nl">Maker</guiname> - </gui> - <editor> - <positions> - <input>97</input> - <search>97</search> - </positions> - </editor> - <datatype base="creator" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> - </field> - - <field name="lastmodified" readonly="true" state="system"> - <descriptions> - <description xml:lang="en">Date and time the item was last modified</description> - <description xml:lang="nl">Datum en tijd waarop het item het laatst werd gewijzigd</description> - </descriptions> - <gui> - <guiname xml:lang="en">Lastmodified</guiname> - <guiname xml:lang="nl">Laatst veranderd</guiname> - </gui> - <editor> - <positions> - <list>-1</list> - <input>98</input> - <search>98</search> - </positions> - </editor> - <datatype base="lastmodified" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> - </field> - - <field name="lastmodifier" readonly="true" state="system"> - <descriptions> - <description xml:lang="en">Username of the person who last modified this item</description> - <description xml:lang="nl">Inlognaam van de gebruiker die het item het laatst heeft veranderd</description> - </descriptions> - <gui> - <guiname xml:lang="en">Lastmodifier</guiname> - <guiname xml:lang="nl">Laatst veranderd door</guiname> - </gui> - <editor> - <positions> - <input>99</input> - <search>99</search> - </positions> - </editor> - <datatype base="lastmodifier" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> - </field> - <!-- /END CODE DUPLICATION --> - - </fieldlist> - <!-- - <xi:include href="http://www.mmbase.org/builders/mmsite/content.meta.fields.xml"; /> - --> - <functionlist> - <function> - <class>org.mmbase.portal.PageCloner</class> - </function> - </functionlist> -</builder> Copied: speeltuin/mihxil/portal/0.3/src/main/config/builders/portal/pages.xml (from rev 41638, speeltuin/mihxil/portal/trunk/src/main/config/builders/portal/pages.xml) =================================================================== --- speeltuin/mihxil/portal/0.3/src/main/config/builders/portal/pages.xml (rev 0) +++ speeltuin/mihxil/portal/0.3/src/main/config/builders/portal/pages.xml 2010-03-26 16:25:29 UTC (rev 41641) @@ -0,0 +1,292 @@ +<?xml version="1.0" encoding="UTF-8"?> +<builder + xmlns="http://www.mmbase.org/xmlns/builder"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:xi="http://www.w3.org/2001/XInclude"; + xsi:schemaLocation="http://www.mmbase.org/xmlns/builder + http://www.mmbase.org/xmlns/builder.xsd"; + name="pages" maintainer="mmbase.org" version="0" extends="object"> + <searchage>3000</searchage> + <names> + <singular xml:lang="en">Page</singular> + <singular xml:lang="nl">Pagina</singular> + <plural xml:lang="en">Pages</plural> + <plural xml:lang="nl">Pagina's</plural> + </names> + <descriptions> + <description xml:lang="en">A page in a website</description> + <description xml:lang="nl">Een pagina in een website</description> + </descriptions> + <properties /> + <fieldlist> + + <field name="title"> + <descriptions> + <description xml:lang="en">The title, also pagetitle</description> + <description xml:lang="nl">De titel, tevens titel van de pagina</description> + </descriptions> + <gui> + <guiname xml:lang="en">Title</guiname> + <guiname xml:lang="nl">Titel</guiname> + </gui> + <editor> + <positions> + <input>1</input> + <list>1</list> + <search>1</search> + </positions> + </editor> + <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <required value="true"> + <description xml:lang="nl">Titel is een verplicht veld</description> + <description xml:lang="en">A title is required</description> + </required> + <maxLength value="255" /> + </datatype> + </field> + + <field name="path"> + <descriptions> + <description xml:lang="en">Path from root of site, like '/en/about'</description> + <description xml:lang="nl">Pad vanaf de root van de site, bijvoorbeeld '/over/ons'</description> + </descriptions> + <gui> + <guiname xml:lang="en">Path</guiname> + <guiname xml:lang="nl">Pad</guiname> + </gui> + <editor> + <positions> + <input>2</input> + <list>2</list> + <search>2</search> + </positions> + </editor> + <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <default value="/" /> + <required value="true"> + <description xml:lang="nl">Pad is een verplicht veld</description> + <description xml:lang="en">A path is required field</description> + </required> + <maxLength value="255" /> + </datatype> + </field> + + <!-- + <field name="template"> + <descriptions> + <description xml:lang="nl">Template voor de pagina</description> + <description xml:lang="en">Page template to use</description> + </descriptions> + <gui> + <guiname xml:lang="en">Template</guiname> + <guiname xml:lang="nl">Template</guiname> + </gui> + <editor> + <positions> + <input>4</input> + <search>4</search> + </positions> + </editor> + <datatype xmlns="http://www.mmbase.org/xmlns/datatypes"; base="templates"> + <default value="template_content" /> + </datatype> + </field> + --> + <field name="description"> + <descriptions> + <description xml:lang="en">Short description of the page.</description> + <description xml:lang="nl">Korte beschrijving van de pagina.</description> + </descriptions> + <gui> + <guiname xml:lang="en">Description</guiname> + <guiname xml:lang="nl">Beschrijving</guiname> + </gui> + <editor> + <positions> + <input>5</input> + <search>5</search> + </positions> + </editor> + <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <maxLength value="1024" /> + </datatype> + </field> + + <field name="expires"> + <descriptions> + <description xml:lang="en">When this page expires, in seconds after it was first viewed (expires response header).</description> + <description xml:lang="nl">Houdbaarheidstijd van de pagina in seconden (expires response header).</description> + </descriptions> + <gui> + <guiname xml:lang="en">Expires</guiname> + <guiname xml:lang="nl">Expires</guiname> + </gui> + <editor> + <positions> + <input>9</input> + <search>9</search> + </positions> + </editor> + <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <default value="60" /> + </datatype> + </field> + + + <!-- COPIED FROM http://www.mmbase.org/builders/mmsite/content.meta.fields.xml + Just to maintain MMBase-1.8 and Non-xinclude capable xml-parsers compatibility. + --> + + <field name="show"> + <descriptions> + <description xml:lang="nl">Of dit item getoond moet worden</description> + <description xml:lang="en">Whether to show this item</description> + </descriptions> + <gui> + <guiname xml:lang="nl">Tonen</guiname> + <guiname xml:lang="en">Show</guiname> + </gui> + <editor> + <positions> + <input>92</input> + <list>92</list> + <search>92</search> + </positions> + </editor> + <datatype xmlns="http://www.mmbase.org/xmlns/datatypes"; base="onoff"> + <default value="true" /> + </datatype> + </field> + + <field name="online"> + <descriptions> + <description xml:lang="nl">Datum en tijd waarop het getoond moet worden</description> + <description xml:lang="en">Date and time to display this item</description> + </descriptions> + <gui> + <guiname xml:lang="nl">On-line op</guiname> + <guiname xml:lang="en">Online on</guiname> + </gui> + <editor> + <positions> + <input>93</input> + <list>-1</list> + <search>93</search> + </positions> + </editor> + <datatype base="datetime" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <default value="today" /> + <minInclusive enforce="never" value="today - 10 year" /> + <maxInclusive enforce="never" value="today + 99 year" /> + </datatype> + </field> + + <field name="offline"> + <descriptions> + <description xml:lang="nl">Datum en tijd waarop het niet meer getoond moet worden</description> + <description xml:lang="en">Date and time to end displaying this item</description> + </descriptions> + <gui> + <guiname xml:lang="nl">Off-line op</guiname> + <guiname xml:lang="en">Offline on</guiname> + </gui> + <editor> + <positions> + <input>93</input> + <list>-1</list> + <search>93</search> + </positions> + </editor> + <datatype base="datetime" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <default value="today + 100 year" /> + <minInclusive enforce="never" value="today - 10 year" /> + <maxInclusive enforce="never" value="today + 180 year" /> + </datatype> + </field> + + <field name="created" readonly="true" state="system"> + <descriptions> + <description xml:lang="en">Creation date of this item</description> + <description xml:lang="nl">Creatiedatum van het item</description> + </descriptions> + <gui> + <guiname xml:lang="en">Created</guiname> + <guiname xml:lang="nl">Aangemaakt</guiname> + </gui> + <editor> + <positions> + <input>96</input> + <search>96</search> + </positions> + </editor> + <datatype base="created" xmlns="http://www.mmbase.org/xmlns/datatypes";> + <default value="now" /> + </datatype> + </field> + + <field name="creator" readonly="true" state="system"> + <descriptions> + <description xml:lang="en">User that created this item</description> + <description xml:lang="nl">De gebruiker die dit item aanmaakte</description> + </descriptions> + <gui> + <guiname xml:lang="en">Creator</guiname> + <guiname xml:lang="nl">Maker</guiname> + </gui> + <editor> + <positions> + <input>97</input> + <search>97</search> + </positions> + </editor> + <datatype base="creator" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> + </field> + + <field name="lastmodified" readonly="true" state="system"> + <descriptions> + <description xml:lang="en">Date and time the item was last modified</description> + <description xml:lang="nl">Datum en tijd waarop het item het laatst werd gewijzigd</description> + </descriptions> + <gui> + <guiname xml:lang="en">Lastmodified</guiname> + <guiname xml:lang="nl">Laatst veranderd</guiname> + </gui> + <editor> + <positions> + <list>-1</list> + <input>98</input> + <search>98</search> + </positions> + </editor> + <datatype base="lastmodified" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> + </field> + + <field name="lastmodifier" readonly="true" state="system"> + <descriptions> + <description xml:lang="en">Username of the person who last modified this item</description> + <description xml:lang="nl">Inlognaam van de gebruiker die het item het laatst heeft veranderd</description> + </descriptions> + <gui> + <guiname xml:lang="en">Lastmodifier</guiname> + <guiname xml:lang="nl">Laatst veranderd door</guiname> + </gui> + <editor> + <positions> + <input>99</input> + <search>99</search> + </positions> + </editor> + <datatype base="lastmodifier" xmlns="http://www.mmbase.org/xmlns/datatypes"; /> + </field> + <!-- /END CODE DUPLICATION --> + + </fieldlist> + <!-- + <xi:include href="http://www.mmbase.org/builders/mmsite/content.meta.fields.xml"; /> + --> + <functionlist> + <function> + <class>org.mmbase.portal.PageCloner</class> + </function> + </functionlist> +</builder> Deleted: speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/mmbase-portal.tld =================================================================== --- speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/mmbase-portal.tld 2010-03-26 15:57:39 UTC (rev 41635) +++ speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/mmbase-portal.tld 2010-03-26 16:25:29 UTC (rev 41641) @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<taglib xmlns="http://java.sun.com/xml/ns/j2ee"; - version="2.0" - xmlns:ns0="http://www.w3.org/2001/XMLSchema-instance"; - ns0:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";> - - <tlib-version>1.0</tlib-version> - <short-name>mm-portal</short-name> - <uri>http://www.mmbase.org/tags/mm/portal</uri> - - <tag-file> - <name>blocks</name> - <path>/META-INF/tags/mm/portal/blocks.tagx</path> - </tag-file> - - <tag-file> - <name>block</name> - <path>/META-INF/tags/mm/portal/block.tagx</path> - </tag-file> - - <tag-file> - <name>page</name> - <path>/META-INF/tags/mm/portal/page.tagx</path> - </tag-file> - - - <tag-file> - <name>pages</name> - <path>/META-INF/tags/mm/portal/pages.tagx</path> - </tag-file> - - -</taglib> Copied: speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/mmbase-portal.tld (from rev 41636, speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/mmbase-portal.tld) =================================================================== --- speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/mmbase-portal.tld (rev 0) +++ speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/mmbase-portal.tld 2010-03-26 16:25:29 UTC (rev 41641) @@ -0,0 +1,39 @@ +<?xml version="1.0"?> +<taglib xmlns="http://java.sun.com/xml/ns/j2ee"; + version="2.0" + xmlns:ns0="http://www.w3.org/2001/XMLSchema-instance"; + ns0:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd";> + + <tlib-version>1.0</tlib-version> + <short-name>mm-portal</short-name> + <uri>http://www.mmbase.org/tags/mm/portal</uri> + + <tag-file> + <name>blocks</name> + <path>/META-INF/tags/mm/portal/blocks.tagx</path> + </tag-file> + + <tag-file> + <name>block</name> + <path>/META-INF/tags/mm/portal/block.tagx</path> + </tag-file> + + + <tag-file> + <name>related</name> + <path>/META-INF/tags/mm/portal/related.tagx</path> + </tag-file> + + <tag-file> + <name>page</name> + <path>/META-INF/tags/mm/portal/page.tagx</path> + </tag-file> + + + <tag-file> + <name>pages</name> + <path>/META-INF/tags/mm/portal/pages.tagx</path> + </tag-file> + + +</taglib> Deleted: speeltuin/mihxil/portal/0.3/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 15:57:39 UTC (rev 41635) +++ speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/tags/mm/portal/block.tagx 2010-03-26 16:25:29 UTC (rev 41641) @@ -1,30 +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"; - 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/0.3/src/main/resources/META-INF/tags/mm/portal/block.tagx (from rev 41637, speeltuin/mihxil/portal/trunk/src/main/resources/META-INF/tags/mm/portal/block.tagx) =================================================================== --- speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/tags/mm/portal/block.tagx (rev 0) +++ speeltuin/mihxil/portal/0.3/src/main/resources/META-INF/tags/mm/portal/block.tagx 2010-03-26 16:25:29 UTC (rev 41641) @@ -0,0 +1,35 @@ +<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" /> + <jsp:directive.attribute name="block" type="org.mmbase.bridge.Node" required="true" /> + <jsp:directive.attribute name="blockposrel" type="org.mmbase.bridge.Node" required="true" /> + <os:cache + refreshpolicyclass="${empty block.refreshpolicy ? 'org.mmbase.portal.refresh.Expires' : block.refreshpolicy}" + refreshpolicyparam="${empty block.refreshpolicy and empty block.refreshpolicyparam ? '3600' : block.refreshpolicyparam}" + refresh="${param[flushparam] eq blockposrel.number}" + scope="application" + key="${group}/${blockposrel}" + groups="${group}" + > + <c:catch var="e"> + <jsp:text><!--</jsp:text><mm:time time="now" />:${group}/${blockposrel} <jsp:text>--></jsp:text> + <jsp:doBody /> + </c:catch> + <c:if test="${! empty e}"> + <mm:log>${e}</mm:log> + <os:usecached /> + </c:if> + </os:cache> + <c:if test="${! empty e}"> + <div class="error"><mm:write value="${e}" /></div> + </c:if> +</jsp:root> Deleted: speeltuin/mihxil/portal/0.3/test-webapp/pom.xml =================================================================== --- speeltuin/mihxil/portal/trunk/test-webapp/pom.xml 2010-03-26 15:57:39 UTC (rev 41635) +++ speeltuin/mihxil/portal/0.3/test-webapp/pom.xml 2010-03-26 16:25:29 UTC (rev 41641) @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-parent</artifactId> - <version>1.9-SNAPSHOT</version> - </parent> - - <artifactId>portal-testapp</artifactId> - <packaging>war</packaging> - <name>MMBase Portal Test webapp</name> - <version>${mmbase.version}</version> - - <properties> - <my.postfix>${mmbase.version.postfix}</my.postfix> - <base.version>${mmbase.version.number}${my.postfix}</base.version> - <jdbcUrl>jdbc:hsqldb:file:data/mmbase</jdbcUrl> - </properties> - - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>tomcat-maven-plugin</artifactId> - <configuration> - <warSourceDirectory>src/main/webapp</warSourceDirectory> - </configuration> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>7.0.0.pre5</version> - <configuration> - <jettyEnvXml>${basedir}/jetty-env.xml</jettyEnvXml> - <systemProperties> - <systemProperty> - <name>jdbcUrl</name> - <value>${jdbcUrl}</value> - </systemProperty> - <systemProperty> - <name>com.sun.management.jmxremote</name> - <value>true</value> - </systemProperty> - <systemProperty> - <!-- Avoids the incredibly silly 'Laucher' in the windowlist of OSX --> - <name>java.awt.headless</name> - <value>true</value> - </systemProperty> - <systemProperty> - <!-- - This may not be very safe, but we use jetty only for developing - See: http://communitymapbuilder.org/display/JETTY/How+to+enable+serving+aliased+files - --> - <name>org.mortbay.util.FileResource.checkAliases</name> - <value>false</value> - </systemProperty> - </systemProperties> - </configuration> - <dependencies> - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1.2</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> - </dependency> - </dependencies> - </plugin> - <!-- - it's broken. - <plugin> - <groupId>com.caucho</groupId> - <artifactId>resin-maven-plugin</artifactId> - <version>4.0.0</version> - </plugin> - --> - - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.mmbase</groupId> - <artifactId>base-webapp</artifactId> - <version>${mmbase.version}</version> - <type>war</type> - </dependency> - - <dependency> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-portal</artifactId> - <version>0.3-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-mynews</artifactId> - <version>${mmbase.version}</version> - <type>war</type> - </dependency> - - <dependency> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-resources</artifactId> - <version>${mmbase.version}</version> - <type>war</type> - </dependency> - - <dependency> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-searchrelate</artifactId> - <version>${mmbase.version}</version> - <type>war</type> - </dependency> - - <dependency> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-vpro-wizards</artifactId> - <version>2.0-SNAPSHOT</version> - <type>war</type> - </dependency> - - <dependency> - <groupId>org.mmbase.jquery</groupId> - <artifactId>jquery-ui</artifactId> - <version>1.7.2-2</version> - <type>war</type> - </dependency> - - <dependency> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-vpro-wizards</artifactId> - <version>${mmbase.version}</version> - <classifier>examples</classifier> - <type>war</type> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>2.5.6</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - - </dependencies> - -</project> - Copied: speeltuin/mihxil/portal/0.3/test-webapp/pom.xml (from rev 41639, speeltuin/mihxil/portal/trunk/test-webapp/pom.xml) =================================================================== --- speeltuin/mihxil/portal/0.3/test-webapp/pom.xml (rev 0) +++ speeltuin/mihxil/portal/0.3/test-webapp/pom.xml 2010-03-26 16:25:29 UTC (rev 41641) @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.mmbase</groupId> + <artifactId>mmbase-parent</artifactId> + <version>1.9-SNAPSHOT</version> + </parent> + + <artifactId>portal-testapp</artifactId> + <packaging>war</packaging> + <name>MMBase Portal Test webapp</name> + <version>${mmbase.version}</version> + + <properties> + <my.postfix>${mmbase.version.postfix}</my.postfix> + <base.version>${mmbase.version.number}${my.postfix}</base.version> + <jdbcUrl>jdbc:hsqldb:file:data/mmbase</jdbcUrl> + </properties> + + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>tomcat-maven-plugin</artifactId> + <configuration> + <warSourceDirectory>src/main/webapp</warSourceDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.0.0.pre5</version> + <configuration> + <jettyEnvXml>${basedir}/jetty-env.xml</jettyEnvXml> + <systemProperties> + <systemProperty> + <name>jdbcUrl</name> + <value>${jdbcUrl}</value> + </systemProperty> + <systemProperty> + <name>com.sun.management.jmxremote</name> + <value>true</value> + </systemProperty> + <systemProperty> + <!-- Avoids the incredibly silly 'Laucher' in the windowlist of OSX --> + <name>java.awt.headless</name> + <value>true</value> + </systemProperty> + <systemProperty> + <!-- + This may not be very safe, but we use jetty only for developing + See: http://communitymapbuilder.org/display/JETTY/How+to+enable+serving+aliased+files + --> + <name>org.mortbay.util.FileResource.checkAliases</name> + <value>false</value> + </systemProperty> + </systemProperties> + </configuration> + <dependencies> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.1.2</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + </dependency> + </dependencies> + </plugin> + <!-- + it's broken. + <plugin> + <groupId>com.caucho</groupId> + <artifactId>resin-maven-plugin</artifactId> + <version>4.0.0</version> + </plugin> + --> + + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.mmbase</groupId> + <artifactId>base-webapp</artifactId> + <version>${mmbase.version}</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.mmbase</groupId> + <artifactId>mmbase-portal</artifactId> + <version>0.3-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.mmbase</groupId> + <artifactId>mmbase-mynews</artifactId> + <version>${mmbase.version}</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.mmbase</groupId> + <artifactId>mmbase-resources</artifactId> + <version>${mmbase.version}</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.mmbase</groupId> + <artifactId>mmbase-searchrelate</artifactId> + <version>${mmbase.version}</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.mmbase</groupId> + <artifactId>mmbase-vpro-wizards</artifactId> + <version>2.0-SNAPSHOT</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.mmbase.jquery</groupId> + <artifactId>jquery-ui</artifactId> + <version>1.8-1</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.mmbase</groupId> + <artifactId>mmbase-vpro-wizards</artifactId> + <version>${mmbase.version}</version> + <classifier>examples</classifier> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>2.5.6</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + </dependencies> + +</project> + Deleted: speeltuin/mihxil/portal/0.3/test-webapp/src/main/webapp/edit/page/index.jspx =================================================================== --- speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/index.jspx 2010-03-26 15:57:39 UTC (rev 41635) +++ speeltuin/mihxil/portal/0.3/test-webapp/src/main/webapp/edit/page/index.jspx 2010-03-26 16:25:29 UTC (rev 41641) @@ -1,121 +0,0 @@ -<mm:content - xmlns:jsp="http://java.sun.com/JSP/Page"; - xmlns:c="http://java.sun.com/jsp/jstl/core"; - xmlns:fn="http://java.sun.com/jsp/jstl/functions"; - xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate"; - xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; - xmlns:mm-portal="http://www.mmbase.org/tags/mm/portal"; - xmlns:mm-portalt="urn:jsptagdir:/WEB-INF/tags/mm/portal" - xmlns:os="http://www.opensymphony.com/oscache"; - expires="0" type="application/xhtml+xml" - language="client" postprocessor="none"> - <mm:import externid="showdate">now</mm:import> - <mm:import externid="servletpath" required="true" /> - <mm:cloud method="http" rank="basic user"> - - <mm:import externid="page" /> - <html xmlns="http://www.w3.org/1999/xhtml"; - xml:lang="${requestScope['javax.servlet.jsp.jstl.fmt.locale.request']}"> - - <head> - <mm:link page="/mmbase/portal/portal.css.jsp"> - <mm:param name="height">150</mm:param> - <mm:param name="width">150</mm:param> - <mm:param name="borderx">2</mm:param> - <mm:param name="bordery">2</mm:param> - <mm:param name="absolutepositions">false</mm:param> - <link rel="stylesheet" type="text/css" href="${_}" /> - </mm:link> - <mm:include page="/mmbase/jquery/jquery-ui.jspx" /> - <mm:link page="/mmbase/jquery/css/jquery-ui-1.7.2.custom.css"> - <link type="text/css" href="${_}" rel="stylesheet" /> - </mm:link> - <style type="text/css"> - .mm_portal_content { - margin-left: 0px; - background-color: yellow; - - } - .mm_portal_content .block { - float: left; - position: static; - margin: 0; padding: 0px; - border: dashed 1px green; - } - </style> - - <script type="text/javascript"> - $(function() { - $(".mm_portal_content").sortable(); - $("select.width").live("change", function() { - $(this).closest(".block").removeClass("width1 width2 width3 width4"); - $(this).closest(".block").addClass("width" + $(this).val()); - }); - $("select.height").live("change", function() { - $(this).closest(".block").removeClass("height1 height2 height3 height4"); - $(this).closest(".block").addClass("height" + $(this).val()); - }); - }); - </script> - - </head> - <body> - <c:choose> - <c:when test="${empty page}"> - <table> - <mm-portal:pages path="${path}" online="false"> - <tr> - <td><mm:field name="title" /></td> - <td><mm:field name="online"><mm:time format=":SHORT.SHORT" /></mm:field></td> - <td><mm:field name="offline"><mm:time format=":SHORT.SHORT" /></mm:field></td> - <td> - <mm:link referids="servletpath,_n...@page"> - <a href="${_}">${_node}</a> - </mm:link> - </td> - </tr> - </mm-portal:pages> - </table> - </c:when> - <c:otherwise> - <mm:node number="${page}"> - <table> - <mm:fieldlist type="edit"> - <tr> - <th><mm:fieldinfo type="guiname" /></th> - <td> - <mm:fieldinfo type="input" /> - <mm:fieldinfo type="errors" /> - </td> - </tr> - </mm:fieldlist> - </table> - <mm-sr:search type="blocks" implicit="false" /> - <mm-portal:blocks> - <select class="width" name="width"> - <c:forEach begin="1" end="4" var="w"> - <mm:option value="${w}" compare="${blockposrel.width}">${w}</mm:option> - </c:forEach> - </select> - x - <select class="height" name="height"> - <c:forEach begin="1" end="3" var="h"> - <mm:option value="${h}" compare="${blockpsorel.height}">${h}</mm:option> - </c:forEach> - </select> - <br /> - ${blockposrel.number} / - ${blockposrel.x} ${blockposrel.y} - - <mm:node referid="block"> - <mm:field name="name" /> - <mm:field name="description" /> - </mm:node> - </mm-portal:blocks> - </mm:node> - </c:otherwise> - </c:choose> - </body> - </html> - </mm:cloud> -</mm:content> Copied: speeltuin/mihxil/portal/0.3/test-webapp/src/main/webapp/edit/page/index.jspx (from rev 41640, speeltuin/mihxil/portal/trunk/test-webapp/src/main/webapp/edit/page/index.jspx) =================================================================== --- speeltuin/mihxil/portal/0.3/test-webapp/src/main/webapp/edit/page/index.jspx (rev 0) +++ speeltuin/mihxil/portal/0.3/test-webapp/src/main/webapp/edit/page/index.jspx 2010-03-26 16:25:29 UTC (rev 41641) @@ -0,0 +1,145 @@ +<mm:content + xmlns:jsp="http://java.sun.com/JSP/Page"; + xmlns:c="http://java.sun.com/jsp/jstl/core"; + xmlns:fn="http://java.sun.com/jsp/jstl/functions"; + xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate"; + xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"; + xmlns:mm-portal="http://www.mmbase.org/tags/mm/portal"; + xmlns:mm-portalt="urn:jsptagdir:/WEB-INF/tags/mm/portal" + xmlns:os="http://www.opensymphony.com/oscache"; + expires="0" type="text/html" + language="client" postprocessor="none"> + <mm:import externid="showdate">now</mm:import> + <mm:import externid="servletpath" required="true" /> + <mm:cloud method="http" rank="basic user"> + + <mm:import externid="page" /> + <html xmlns="http://www.w3.org/1999/xhtml"; + xml:lang="${requestScope['javax.servlet.jsp.jstl.fmt.locale.request']}"> + + <head> + <mm:link page="/mmbase/portal/portal.css.jsp"> + <mm:param name="height">150</mm:param> + <mm:param name="width">150</mm:param> + <mm:param name="borderx">2</mm:param> + <mm:param name="bordery">2</mm:param> + <mm:param name="absolutepositions">false</mm:param> + <link rel="stylesheet" type="text/css" href="${_}" /> + </mm:link> + <mm:include page="/mmbase/jquery/jquery-ui.jspx" /> + <mm:link page="/mmbase/jquery/css/jquery-ui-${requestScope['org.mmbase.jquery.ui.version']}.custom.css"> + <link type="text/css" href="${_}" rel="stylesheet" /> + </mm:link> + <style type="text/css"> + .mm_portal_content { + margin-left: 0px; + position: relative; + background-color: yellow; + + } + .mm_portal_content .block { + position: relative; + float: left; + margin: 0; padding: 0px; + border: dashed 1px green; + + } + </style> + + <script type="text/javascript"> + $(function() { + $("#test").draggable({ + cursor: 'move', + init: function() { + console.log("hi"); + }, + start: function(event, ui) { + var el = event.target; + alert('hoi'); + console.log(event); + console.log(el); + console.log(ui); + $(el).removeClass("x0 x1 x2 x3 y0 y1 y2 y4"); + }, + + helper: function(event) { + console.log(event); + } + }); + + + $("select.width").live("change", function() { + $(this).closest(".block").removeClass("width1 width2 width3 width4"); + $(this).closest(".block").addClass("width" + $(this).val()); + }); + $("select.height").live("change", function() { + $(this).closest(".block").removeClass("height1 height2 height3 height4"); + $(this).closest(".block").addClass("height" + $(this).val()); + }); + }); + </script> + + </head> + <body> + <div id="test"> + KOLERE + </div> + <c:choose> + <c:when test="${empty page}"> + <table> + <mm-portal:pages path="${path}" online="false"> + <tr> + <td><mm:field name="title" /></td> + <td><mm:field name="online"><mm:time format=":SHORT.SHORT" /></mm:field></td> + <td><mm:field name="offline"><mm:time format=":SHORT.SHORT" /></mm:field></td> + <td> + <mm:link referids="servletpath,_n...@page"> + <a href="${_}">${_node}</a> + </mm:link> + </td> + </tr> + </mm-portal:pages> + </table> + </c:when> + <c:otherwise> + <mm:node number="${page}"> + <table> + <mm:fieldlist type="edit"> + <tr> + <th><mm:fieldinfo type="guiname" /></th> + <td> + <mm:fieldinfo type="input" /> + <mm:fieldinfo type="errors" /> + </td> + </tr> + </mm:fieldlist> + </table> + <mm-sr:search type="blocks" implicit="false" /> + <mm-portal:blocks> + <select class="width" name="width"> + <c:forEach begin="1" end="4" var="w"> + <mm:option value="${w}" compare="${blockposrel.width}">${w}</mm:option> + </c:forEach> + </select> + x + <select class="height" name="height"> + <c:forEach begin="1" end="3" var="h"> + <mm:option value="${h}" compare="${blockposrel.height}">${h}</mm:option> + </c:forEach> + </select> + <br /> + ${blockposrel.number} / + ${blockposrel.x} ${blockposrel.y} + + <mm:node referid="block"> + <mm:field name="name" /> + <mm:field name="description" /> + </mm:node> + </mm-portal:blocks> + </mm:node> + </c:otherwise> + </c:choose> + </body> + </html> + </mm:cloud> +</mm:content> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
