Author: andre
Date: 2009-05-08 22:35:19 +0200 (Fri, 08 May 2009)
New Revision: 35053

Added:
   speeltuin/andre/mmsite/config/builders/mmsite/content.data.fields.xml
   speeltuin/andre/mmsite/config/builders/mmsite/content.meta.fields.xml
Modified:
   speeltuin/andre/mmsite/config/applications/MMSite.xml
   speeltuin/andre/mmsite/config/builders/mmsite/articles.xml
   speeltuin/andre/mmsite/config/builders/mmsite/pages.xml
   speeltuin/andre/mmsite/config/builders/mmsite/templates.xml
Log:
added x:include fields, made all builders etc mmbase.org, some bugfixes

Modified: speeltuin/andre/mmsite/config/applications/MMSite.xml
===================================================================
--- speeltuin/andre/mmsite/config/applications/MMSite.xml       2009-05-08 
20:14:38 UTC (rev 35052)
+++ speeltuin/andre/mmsite/config/applications/MMSite.xml       2009-05-08 
20:35:19 UTC (rev 35053)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE application PUBLIC "-//MMBase//DTD application config 1.1//EN" 
"http://www.mmbase.org/dtd/application_1_1.dtd";>
-<application name="MMSite" maintainer="toly.nl" version="2" auto-deploy="true">
+<application name="MMSite" maintainer="mmbase.org" version="2" 
auto-deploy="true">
 
   <requirements>
     <requires name="Resources" maintainer="mmbase.org" version="1" />
   </requirements>
 
   <neededbuilderlist>
-    <builder maintainer="toly.nl" version="1">articles</builder>
+    <builder maintainer="mmbase.org" version="1">articles</builder>
     <!-- site structure -->
-    <builder maintainer="toly.nl" version="1">templates</builder>
-    <builder maintainer="toly.nl" version="1">pages</builder>
+    <builder maintainer="mmbase.org" version="1">templates</builder>
+    <builder maintainer="mmbase.org" version="1">pages</builder>
     
     <!-- resources app -->
 <!-- 

Modified: speeltuin/andre/mmsite/config/builders/mmsite/articles.xml
===================================================================
--- speeltuin/andre/mmsite/config/builders/mmsite/articles.xml  2009-05-08 
20:14:38 UTC (rev 35052)
+++ speeltuin/andre/mmsite/config/builders/mmsite/articles.xml  2009-05-08 
20:35:19 UTC (rev 35053)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <builder
     xmlns="http://www.mmbase.org/xmlns/builder";
+    xmlns:xi="http://www.w3.org/2001/XInclude";
     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="articles" maintainer="toly.nl" version="0" extends="object">
+    name="articles" maintainer="mmbase.org" version="0" extends="object">
   <searchage>999</searchage>
   <names>
     <singular xml:lang="en">Article</singular>
@@ -13,248 +14,11 @@
     <plural xml:lang="nl">Artikelen</plural>
   </names>
   <descriptions>
-    <description xml:lang="en">A article in this site</description>
+    <description xml:lang="en">An article in this site</description>
     <description xml:lang="nl">Een artikel in deze site.</description>
   </descriptions>
-
   
-  <fieldlist>
-   
-    <field name="title">
-      <descriptions>
-        <description xml:lang="en">The title of the article</description>
-        <description xml:lang="nl">De titel van het artikel</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";>
-        <minLength value="1">
-          <description xml:lang="nl">Titel is een verplicht veld</description>
-          <description xml:lang="en">A title is required</description>
-        </minLength>
-        <maxLength value="255" />
-      </datatype>
-    </field>
-    
-    <!-- subtitle -->
-    <field name="subtitle">
-      <descriptions>
-        <description xml:lang="en">Secondary title or subtitle</description>
-        <description xml:lang="nl">Secundaire titel of subtitel</description>
-      </descriptions>
-      <gui>
-        <guiname xml:lang="en">Subtitle</guiname>
-        <guiname xml:lang="nl">Subtitel</guiname>
-      </gui>
-      <editor>
-        <positions>
-          <input>6</input>
-          <search>6</search>
-        </positions>
-      </editor>
-      <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";>
-        <maxLength value="255" />
-      </datatype>
-    </field>
-    
-    <!-- intro -->
-    <field name="intro">
-      <descriptions>
-        <description xml:lang="en">Introduction text or teaser</description>
-        <description xml:lang="nl">Introductietekst of teaser</description>
-      </descriptions>
-      <gui>
-        <guiname xml:lang="en">Intro</guiname>
-        <guiname xml:lang="nl">Intro</guiname>
-      </gui>
-      <editor>
-        <positions>
-          <input>7</input>
-          <search>7</search>
-        </positions>
-      </editor>
-      <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes";>
-        <maxLength value="1024" />
-      </datatype>
-    </field>
-    
-    <!-- body -->
-    <field name="body">
-      <descriptions>
-        <description xml:lang="en">Main text of an item</description>
-        <description xml:lang="nl">Hoofdtekst van het item</description>
-      </descriptions>
-      <gui>
-        <guiname xml:lang="en">Text</guiname>
-        <guiname xml:lang="nl">Tekst</guiname>
-      </gui>
-      <editor>
-        <positions>
-          <input>8</input>
-          <search>8</search>
-        </positions>
-      </editor>
-      <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes";>
-        <maxLength value="64000" />
-      </datatype>
-    </field>
-    
-    <!-- author -->
-    <field name="author">
-      <descriptions>
-        <description xml:lang="en">Author or source of this 
article</description>
-        <description xml:lang="nl">Auteur of bron van dit artikel</description>
-      </descriptions>
-      <gui>
-        <guiname xml:lang="en">Author</guiname>
-        <guiname xml:lang="nl">Auteur</guiname>
-      </gui>
-      <editor>
-        <positions>
-          <input>9</input>
-          <search>9</search>
-        </positions>
-      </editor>
-      <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";>
-        <maxLength value="255" />
-      </datatype>
-    </field>
+  <xi:include 
href="http://www.mmbase.org/builders/mmsite/content.data.fields.xml"; />
+  <xi:include 
href="http://www.mmbase.org/builders/mmsite/content.meta.fields.xml"; />
 
-       <field name="show">
-         <descriptions>
-               <description xml:lang="nl">Tonen of niet tonen. Dat is de 
vraag.</description>
-               <description xml:lang="en">To show or not to show. That is the 
question.</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 dit 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>93</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 dit 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>93</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>
-
-    <!-- created -->
-    <field name="created" readonly="true">
-      <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>
-    
-    <!-- lastmodified -->
-    <field name="lastmodified" readonly="true">
-      <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>98</list>
-          <input>98</input>
-          <search>98</search>
-        </positions>
-      </editor>
-      <datatype base="lastmodified" 
xmlns="http://www.mmbase.org/xmlns/datatypes"; />
-    </field>
-    
-    <!-- lastmodifier -->
-    <field name="lastmodifier" readonly="true">
-      <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>
-
-  </fieldlist>
 </builder>

Added: speeltuin/andre/mmsite/config/builders/mmsite/content.data.fields.xml
===================================================================
--- speeltuin/andre/mmsite/config/builders/mmsite/content.data.fields.xml       
                        (rev 0)
+++ speeltuin/andre/mmsite/config/builders/mmsite/content.data.fields.xml       
2009-05-08 20:35:19 UTC (rev 35053)
@@ -0,0 +1,115 @@
+<?xml version="1.0" ?>
+<fieldlist
+    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";>
+
+
+    <field name="title">
+      <descriptions>
+        <description xml:lang="en">The title of the article</description>
+        <description xml:lang="nl">De titel van het artikel</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";>
+        <minLength value="1">
+          <description xml:lang="nl">Titel is een verplicht veld</description>
+          <description xml:lang="en">A title is required</description>
+        </minLength>
+        <maxLength value="255" />
+      </datatype>
+    </field>
+    
+    <field name="subtitle">
+      <descriptions>
+        <description xml:lang="en">Secondary title or subtitle</description>
+        <description xml:lang="nl">Secundaire titel of subtitel</description>
+      </descriptions>
+      <gui>
+        <guiname xml:lang="en">Subtitle</guiname>
+        <guiname xml:lang="nl">Subtitel</guiname>
+      </gui>
+      <editor>
+        <positions>
+          <input>6</input>
+          <search>6</search>
+        </positions>
+      </editor>
+      <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+        <maxLength value="255" />
+      </datatype>
+    </field>
+    
+    <field name="intro">
+      <descriptions>
+        <description xml:lang="en">Introduction text or teaser</description>
+        <description xml:lang="nl">Introductietekst of teaser</description>
+      </descriptions>
+      <gui>
+        <guiname xml:lang="en">Intro</guiname>
+        <guiname xml:lang="nl">Intro</guiname>
+      </gui>
+      <editor>
+        <positions>
+          <input>7</input>
+          <search>7</search>
+        </positions>
+      </editor>
+      <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+        <maxLength value="1024" />
+      </datatype>
+    </field>
+    
+    <field name="body">
+      <descriptions>
+        <description xml:lang="en">Main text of an item</description>
+        <description xml:lang="nl">Hoofdtekst van het item</description>
+      </descriptions>
+      <gui>
+        <guiname xml:lang="en">Text</guiname>
+        <guiname xml:lang="nl">Tekst</guiname>
+      </gui>
+      <editor>
+        <positions>
+          <input>8</input>
+          <search>8</search>
+        </positions>
+      </editor>
+      <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+        <maxLength value="64000" />
+      </datatype>
+    </field>
+    
+    <field name="author">
+      <descriptions>
+        <description xml:lang="en">Author or source of this item</description>
+        <description xml:lang="nl">Auteur of bron van dit item</description>
+      </descriptions>
+      <gui>
+        <guiname xml:lang="en">Author</guiname>
+        <guiname xml:lang="nl">Auteur</guiname>
+      </gui>
+      <editor>
+        <positions>
+          <input>9</input>
+          <search>9</search>
+        </positions>
+      </editor>
+      <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+        <maxLength value="255" />
+      </datatype>
+    </field>
+
+
+</fieldlist>

Added: speeltuin/andre/mmsite/config/builders/mmsite/content.meta.fields.xml
===================================================================
--- speeltuin/andre/mmsite/config/builders/mmsite/content.meta.fields.xml       
                        (rev 0)
+++ speeltuin/andre/mmsite/config/builders/mmsite/content.meta.fields.xml       
2009-05-08 20:35:19 UTC (rev 35053)
@@ -0,0 +1,151 @@
+<?xml version="1.0" ?>
+<fieldlist
+    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";>
+
+       <field name="show">
+         <descriptions>
+               <description xml:lang="nl">Tonen of niet tonen. Dat is de 
vraag.</description>
+               <description xml:lang="en">To show or not to show. That is the 
question.</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 dit 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>93</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 dit 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>93</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="created" readonly="true">
+      <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">
+      <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">Creƫerder</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">
+      <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>98</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">
+      <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>
+    
+
+</fieldlist>

Modified: speeltuin/andre/mmsite/config/builders/mmsite/pages.xml
===================================================================
--- speeltuin/andre/mmsite/config/builders/mmsite/pages.xml     2009-05-08 
20:14:38 UTC (rev 35052)
+++ speeltuin/andre/mmsite/config/builders/mmsite/pages.xml     2009-05-08 
20:35:19 UTC (rev 35053)
@@ -4,7 +4,7 @@
     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="pages" maintainer="toly.nl" version="0" extends="object">
+    name="pages" maintainer="mmbase.org" version="0" extends="object">
   <searchage>999</searchage>
   <names>
     <singular xml:lang="en">Page</singular>

Modified: speeltuin/andre/mmsite/config/builders/mmsite/templates.xml
===================================================================
--- speeltuin/andre/mmsite/config/builders/mmsite/templates.xml 2009-05-08 
20:14:38 UTC (rev 35052)
+++ speeltuin/andre/mmsite/config/builders/mmsite/templates.xml 2009-05-08 
20:35:19 UTC (rev 35053)
@@ -4,7 +4,7 @@
     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="templates" maintainer="nom.nl" version="0" extends="object">
+    name="templates" maintainer="mmbase.org" version="0" extends="object">
   <names>
     <singular xml:lang="en">Templates</singular>
     <plural xml:lang="en">Template</plural>

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to