Author: kevinshen
Date: 2009-05-21 07:23:32 +0200 (Thu, 21 May 2009)
New Revision: 35331
Added:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/navigationitem.xml
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/page.xml
CMSContainer/trunk/CMSContainer/migration/migration_1.6_to_1.7.txt
Log:
CMSC-1036 Code: introduce supertype NavigationItem
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
2009-05-20 15:14:45 UTC (rev 35330)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml
2009-05-21 05:23:32 UTC (rev 35331)
@@ -16,6 +16,7 @@
<builder maintainer="finalist.com" version="0">stylerel</builder>
<builder maintainer="finalist.com" version="0">viewrel</builder>
<!-- These are the application specific builders -->
+ <builder maintainer="finalist.com" version="0">navigationitem</builder>
<builder maintainer="finalist.com" version="1">layout</builder>
<builder maintainer="finalist.com" version="0">namedrel</builder>
<builder maintainer="finalist.com" version="0">nodeparameter</builder>
Added:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/navigationitem.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/navigationitem.xml
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/navigationitem.xml
2009-05-21 05:23:32 UTC (rev 35331)
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<builder extends="object" maintainer="finalist.com" name="navigationitem"
version="0"
+ 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";>
+ <names>
+ <singular xml:lang="nl">navigationitem</singular>
+ <singular xml:lang="en">navigationitem</singular>
+ <singular xml:lang="zh">导航项</singular>
+ <plural xml:lang="nl">navigationitem</plural>
+ <plural xml:lang="en">navigationitem</plural>
+ <plural xml:lang="zh">导航项</plural>
+ </names>
+ <fieldlist>
+ <field name="creationdate" state="system">
+ <gui>
+ <guiname xml:lang="nl">Aangemaakt</guiname>
+ <guiname xml:lang="en">Creationdate</guiname>
+ <guiname xml:lang="zh">创建日期</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>4</input>
+ </positions>
+ </editor>
+ <datatype base="created"
xmlns="http://www.mmbase.org/xmlns/datatypes"/>
+ </field>
+ <field name="lastmodifieddate" state="system">
+ <gui>
+ <guiname xml:lang="nl">Gewijzigd</guiname>
+ <guiname xml:lang="en">Lastmodifieddate</guiname>
+ <guiname xml:lang="zh">最后修改日期</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>5</input>
+ </positions>
+ </editor>
+ <datatype base="lastmodified"
xmlns="http://www.mmbase.org/xmlns/datatypes"/>
+ </field>
+ <field name="publishdate">
+ <gui>
+ <guiname xml:lang="nl">Publicatie datum</guiname>
+ <guiname xml:lang="en">Publishdate</guiname>
+ <guiname xml:lang="zh">发布日期</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>6</input>
+ </positions>
+ </editor>
+ <datatype base="datetime"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <default value="now"/>
+ </datatype>
+ </field>
+ <field name="expiredate">
+ <gui>
+ <guiname xml:lang="nl">Verloopdatum</guiname>
+ <guiname xml:lang="en">Expiredate</guiname>
+ <guiname xml:lang="zh">失效日期</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>7</input>
+ </positions>
+ </editor>
+ <datatype base="datetime"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <default value="today + 100 year"/>
+ </datatype>
+ </field>
+ <field name="lastmodifier" state="system">
+ <gui>
+ <guiname xml:lang="nl">Gewijzigd door</guiname>
+ <guiname xml:lang="en">Lastmodifier</guiname>
+ <guiname xml:lang="zh">最后修改者</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>8</input>
+ </positions>
+ </editor>
+ <datatype base="lastmodifier"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <maxLength value="1024"/>
+ </datatype>
+ </field>
+ <field name="use_expirydate">
+ <gui>
+ <guiname xml:lang="nl">use_expirydate</guiname>
+ <guiname xml:lang="en">use_expirydate</guiname>
+ <guiname xml:lang="zh">使用有效期</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>9</input>
+ </positions>
+ </editor>
+ <datatype base="yesno"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <required value="true"/>
+ </datatype>
+ </field>
+ <field name="urlfragment">
+ <gui>
+ <guiname xml:lang="nl">URL-fragment</guiname>
+ <guiname xml:lang="en">URL-fragment</guiname>
+ <guiname xml:lang="zh">URL-片段</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>10</input>
+ <list>10</list>
+ <search>10</search>
+ </positions>
+ </editor>
+ <datatype base="line"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <required value="true"/>
+ <maxLength value="255"/>
+ </datatype>
+ </field>
+ <field name="title">
+ <gui>
+ <guiname xml:lang="nl">Titel</guiname>
+ <guiname xml:lang="en">Title</guiname>
+ <guiname xml:lang="zh">标题</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>11</input>
+ <list>11</list>
+ <search>11</search>
+ </positions>
+ </editor>
+ <datatype base="line"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <required value="true"/>
+ <maxLength value="255"/>
+ </datatype>
+ </field>
+ <field name="description">
+ <gui>
+ <guiname xml:lang="nl">Omschrijving</guiname>
+ <guiname xml:lang="en">Description</guiname>
+ <guiname xml:lang="zh">描述</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>12</input>
+ </positions>
+ </editor>
+ <datatype base="line"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <maxLength value="1024"/>
+ </datatype>
+ </field>
+ <field name="inmenu">
+ <gui>
+ <guiname xml:lang="nl">In menu</guiname>
+ <guiname xml:lang="en">In menu</guiname>
+ <guiname xml:lang="zh">在菜单中</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>13</input>
+ </positions>
+ </editor>
+ <datatype base="yesno"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <default value="true"/>
+ <required value="true"/>
+ </datatype>
+ </field>
+ <field name="secure">
+ <gui>
+ <guiname xml:lang="nl">Beveiligd</guiname>
+ <guiname xml:lang="en">Secure</guiname>
+ <guiname xml:lang="zh">安全</guiname>
+ </gui>
+ <editor>
+ <positions>
+ <input>14</input>
+ </positions>
+ </editor>
+ <datatype base="yesno"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <required value="true"/>
+ </datatype>
+ </field>
+ </fieldlist>
+ <indexlist>
+ <index name="expiredate">
+ <indexfield name="use_expirydate"/>
+ <indexfield name="expiredate"/>
+ </index>
+ </indexlist>
+</builder>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/page.xml
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/page.xml
2009-05-20 15:14:45 UTC (rev 35330)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/builders/sitemanagement/page.xml
2009-05-21 05:23:32 UTC (rev 35331)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<builder extends="object" maintainer="finalist.com" name="page" version="1"
+<builder extends="navigationitem" maintainer="finalist.com" name="page"
version="1"
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";>
<class>com.finalist.cmsc.navigation.builder.PageBuilder</class>
@@ -11,175 +11,7 @@
<plural xml:lang="en">Pages</plural>
<plural xml:lang="zh">页面</plural>
</names>
- <fieldlist>
- <field name="creationdate" state="system">
- <gui>
- <guiname xml:lang="nl">Aangemaakt</guiname>
- <guiname xml:lang="en">Creationdate</guiname>
- <guiname xml:lang="zh">创建日期</guiname>
- </gui>
- <editor>
- <positions>
- <input>4</input>
- </positions>
- </editor>
- <datatype base="created"
xmlns="http://www.mmbase.org/xmlns/datatypes"/>
- </field>
- <field name="lastmodifieddate" state="system">
- <gui>
- <guiname xml:lang="nl">Gewijzigd</guiname>
- <guiname xml:lang="en">Lastmodifieddate</guiname>
- <guiname xml:lang="zh">最后修改日期</guiname>
- </gui>
- <editor>
- <positions>
- <input>5</input>
- </positions>
- </editor>
- <datatype base="lastmodified"
xmlns="http://www.mmbase.org/xmlns/datatypes"/>
- </field>
- <field name="publishdate">
- <gui>
- <guiname xml:lang="nl">Publicatie datum</guiname>
- <guiname xml:lang="en">Publishdate</guiname>
- <guiname xml:lang="zh">发布日期</guiname>
- </gui>
- <editor>
- <positions>
- <input>6</input>
- </positions>
- </editor>
- <datatype base="datetime"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <default value="now"/>
- </datatype>
- </field>
- <field name="expiredate">
- <gui>
- <guiname xml:lang="nl">Verloopdatum</guiname>
- <guiname xml:lang="en">Expiredate</guiname>
- <guiname xml:lang="zh">失效日期</guiname>
- </gui>
- <editor>
- <positions>
- <input>7</input>
- </positions>
- </editor>
- <datatype base="datetime"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <default value="today + 100 year"/>
- </datatype>
- </field>
- <field name="lastmodifier" state="system">
- <gui>
- <guiname xml:lang="nl">Gewijzigd door</guiname>
- <guiname xml:lang="en">Lastmodifier</guiname>
- <guiname xml:lang="zh">最后修改者</guiname>
- </gui>
- <editor>
- <positions>
- <input>8</input>
- </positions>
- </editor>
- <datatype base="lastmodifier"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <maxLength value="1024"/>
- </datatype>
- </field>
- <field name="use_expirydate">
- <gui>
- <guiname xml:lang="nl">use_expirydate</guiname>
- <guiname xml:lang="en">use_expirydate</guiname>
- <guiname xml:lang="zh">使用有效期</guiname>
- </gui>
- <editor>
- <positions>
- <input>9</input>
- </positions>
- </editor>
- <datatype base="yesno"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <required value="true"/>
- </datatype>
- </field>
- <field name="urlfragment">
- <gui>
- <guiname xml:lang="nl">URL-fragment</guiname>
- <guiname xml:lang="en">URL-fragment</guiname>
- <guiname xml:lang="zh">URL-片段</guiname>
- </gui>
- <editor>
- <positions>
- <input>10</input>
- <list>10</list>
- <search>10</search>
- </positions>
- </editor>
- <datatype base="line"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <required value="true"/>
- <maxLength value="255"/>
- </datatype>
- </field>
- <field name="title">
- <gui>
- <guiname xml:lang="nl">Titel</guiname>
- <guiname xml:lang="en">Title</guiname>
- <guiname xml:lang="zh">标题</guiname>
- </gui>
- <editor>
- <positions>
- <input>11</input>
- <list>11</list>
- <search>11</search>
- </positions>
- </editor>
- <datatype base="line"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <required value="true"/>
- <maxLength value="255"/>
- </datatype>
- </field>
- <field name="description">
- <gui>
- <guiname xml:lang="nl">Omschrijving</guiname>
- <guiname xml:lang="en">Description</guiname>
- <guiname xml:lang="zh">描述</guiname>
- </gui>
- <editor>
- <positions>
- <input>12</input>
- </positions>
- </editor>
- <datatype base="line"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <maxLength value="1024"/>
- </datatype>
- </field>
- <field name="inmenu">
- <gui>
- <guiname xml:lang="nl">In menu</guiname>
- <guiname xml:lang="en">In menu</guiname>
- <guiname xml:lang="zh">在菜单中</guiname>
- </gui>
- <editor>
- <positions>
- <input>13</input>
- </positions>
- </editor>
- <datatype base="yesno"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <default value="true"/>
- <required value="true"/>
- </datatype>
- </field>
- <field name="secure">
- <gui>
- <guiname xml:lang="nl">Beveiligd</guiname>
- <guiname xml:lang="en">Secure</guiname>
- <guiname xml:lang="zh">安全</guiname>
- </gui>
- <editor>
- <positions>
- <input>14</input>
- </positions>
- </editor>
- <datatype base="yesno"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
- <required value="true"/>
- </datatype>
- </field>
+ <fieldlist>
<!-- Page specific fields -->
<field name="externalurl">
<gui>
Modified: CMSContainer/trunk/CMSContainer/migration/migration_1.6_to_1.7.txt
===================================================================
--- CMSContainer/trunk/CMSContainer/migration/migration_1.6_to_1.7.txt
2009-05-20 15:14:45 UTC (rev 35330)
+++ CMSContainer/trunk/CMSContainer/migration/migration_1.6_to_1.7.txt
2009-05-21 05:23:32 UTC (rev 35331)
@@ -52,3 +52,17 @@
*
*
+Name: Migration from page/rssfeed/pagealias to navigationitem table
+Goal: migrate all page/rssfeed/pagealias to new navigationitem table
+Type: sql-script
+--- Start script ---
+* First start CMSC 1.6 for the first time (it needs to create the
navigationitem tables!)
+* Execute the following script on database:
+INSERT INTO mm_navigationitem select number, otype, owner, creationdate,
lastmodifieddate,publishdate,expiredate,lastmodifier,use_expirydate,urlfragment,title,description,inmenu,secure
from mm_page;
+INSERT INTO mm_navigationitem select number, otype, owner, creationdate,
lastmodifieddate,publishdate,expiredate,lastmodifier,use_expirydate,urlfragment,title,description,inmenu,secure
from mm_rssfeed;
+INSERT INTO mm_navigationitem select number, otype, owner, creationdate,
lastmodifieddate,publishdate,expiredate,lastmodifier,use_expirydate,urlfragment,title,description,inmenu,secure
from mm_pagealias;
+
+INSERT INTO live_navigationitem select number, otype, owner, creationdate,
lastmodifieddate,publishdate,expiredate,lastmodifier,use_expirydate,urlfragment,title,description,inmenu,secure
from live_page;
+INSERT INTO live_navigationitem select number, otype, owner, creationdate,
lastmodifieddate,publishdate,expiredate,lastmodifier,use_expirydate,urlfragment,title,description,inmenu,secure
from live_rssfeed;
+INSERT INTO live_navigationitem select number, otype, owner, creationdate,
lastmodifieddate,publishdate,expiredate,lastmodifier,use_expirydate,urlfragment,title,description,inmenu,secure
from live_pagealias;
+--- End script ---
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
