Author: michiel Date: 2010-03-01 11:42:05 +0100 (Mon, 01 Mar 2010) New Revision: 41192
Added: speeltuin/mihxil/portal/trunk/ speeltuin/mihxil/portal/trunk/Makefile speeltuin/mihxil/portal/trunk/pom.xml speeltuin/mihxil/portal/trunk/src/ speeltuin/mihxil/portal/trunk/src/main/config/builders/portal/pages.xml speeltuin/mihxil/portal/trunk/test-webapp/ Removed: speeltuin/mihxil/portal/Makefile speeltuin/mihxil/portal/pom.xml speeltuin/mihxil/portal/src/main/ speeltuin/mihxil/portal/test-webapp/ speeltuin/mihxil/portal/trunk/src/main/config/builders/portal/pages.xml Log: will make branches Deleted: speeltuin/mihxil/portal/Makefile =================================================================== --- speeltuin/mihxil/portal/Makefile 2010-03-01 10:26:22 UTC (rev 41191) +++ speeltuin/mihxil/portal/Makefile 2010-03-01 10:42:05 UTC (rev 41192) @@ -1,14 +0,0 @@ - -# the maven plugin seems not to be able to do sufficiently -# It'll cost me lots of time to fix the plugin or find work arounds. - -# This works well, and is only a few lines. -# Make rocks... - -.PHONY: clean - - -out: - mvn package - rsync -ra target/site/tlddoc/* mmbase.org:web/tags/mm/portal - Deleted: speeltuin/mihxil/portal/pom.xml =================================================================== --- speeltuin/mihxil/portal/pom.xml 2010-03-01 10:26:22 UTC (rev 41191) +++ speeltuin/mihxil/portal/pom.xml 2010-03-01 10:42:05 UTC (rev 41192) @@ -1,52 +0,0 @@ -<?xml version="1.0"?> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-application-parent</artifactId> - <version>1.9-SNAPSHOT</version> - </parent> - - <artifactId>mmbase-portal</artifactId> - <name>MMBase portal</name> - <version>0.1-SNAPSHOT</version> - <packaging>war</packaging> - - <description> - </description> - - - <dependencies> - <!-- - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.btm</groupId> - <artifactId>btm</artifactId> - <version>1.3.2</version> - </dependency> - --> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - <configuration> - <dontRecurseIntoSubdirs>true</dontRecurseIntoSubdirs> - </configuration> - <executions> - <execution> - <goals> - <goal>taglibdocjar</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> -</project> Copied: speeltuin/mihxil/portal/trunk/Makefile (from rev 40982, speeltuin/mihxil/portal/Makefile) =================================================================== --- speeltuin/mihxil/portal/trunk/Makefile (rev 0) +++ speeltuin/mihxil/portal/trunk/Makefile 2010-03-01 10:42:05 UTC (rev 41192) @@ -0,0 +1,14 @@ + +# the maven plugin seems not to be able to do sufficiently +# It'll cost me lots of time to fix the plugin or find work arounds. + +# This works well, and is only a few lines. +# Make rocks... + +.PHONY: clean + + +out: + mvn package + rsync -ra target/site/tlddoc/* mmbase.org:web/tags/mm/portal + Copied: speeltuin/mihxil/portal/trunk/pom.xml (from rev 40982, speeltuin/mihxil/portal/pom.xml) =================================================================== --- speeltuin/mihxil/portal/trunk/pom.xml (rev 0) +++ speeltuin/mihxil/portal/trunk/pom.xml 2010-03-01 10:42:05 UTC (rev 41192) @@ -0,0 +1,52 @@ +<?xml version="1.0"?> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.mmbase</groupId> + <artifactId>mmbase-application-parent</artifactId> + <version>1.9-SNAPSHOT</version> + </parent> + + <artifactId>mmbase-portal</artifactId> + <name>MMBase portal</name> + <version>0.1-SNAPSHOT</version> + <packaging>war</packaging> + + <description> + </description> + + + <dependencies> + <!-- + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.btm</groupId> + <artifactId>btm</artifactId> + <version>1.3.2</version> + </dependency> + --> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>net.sourceforge.maven-taglib</groupId> + <artifactId>maven-taglib-plugin</artifactId> + <configuration> + <dontRecurseIntoSubdirs>true</dontRecurseIntoSubdirs> + </configuration> + <executions> + <execution> + <goals> + <goal>taglibdocjar</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> +</project> Copied: speeltuin/mihxil/portal/trunk/src (from rev 40982, speeltuin/mihxil/portal/src) Deleted: speeltuin/mihxil/portal/trunk/src/main/config/builders/portal/pages.xml =================================================================== --- speeltuin/mihxil/portal/src/main/config/builders/portal/pages.xml 2010-02-12 14:13:49 UTC (rev 40982) +++ speeltuin/mihxil/portal/trunk/src/main/config/builders/portal/pages.xml 2010-03-01 10:42:05 UTC (rev 41192) @@ -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>s - <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/trunk/src/main/config/builders/portal/pages.xml (from rev 41128, speeltuin/mihxil/portal/src/main/config/builders/portal/pages.xml) =================================================================== --- speeltuin/mihxil/portal/trunk/src/main/config/builders/portal/pages.xml (rev 0) +++ speeltuin/mihxil/portal/trunk/src/main/config/builders/portal/pages.xml 2010-03-01 10:42:05 UTC (rev 41192) @@ -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 + 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/trunk/test-webapp (from rev 40982, speeltuin/mihxil/portal/test-webapp) _______________________________________________ Cvs mailing list [email protected] http://lists.mmbase.org/mailman/listinfo/cvs
