Update of /cvs-repository/Products/CMFDefault/profiles/default/types
In directory cvs.zope.org:/tmp/cvs-serv32673/CMFDefault/profiles/default/types

Modified Files:
      Tag: CMF-1_5-branch
        Discussion_Item.xml Document.xml Favorite.xml File.xml 
        Folder.xml Image.xml Link.xml News_Item.xml Topic.xml 
Log Message:
Merge from HEAD:

Use a new XML format for import/export of types, where the properties
are generic. Now arbitrary TypeInformation objects can be used, as long
as they are configured using properties.

Split ConfiguratorBase into ImportConfiguratorBase and
ExportConfiguratorBase, as they really are unrelated.
Split typeinfo configurators and tests into Import and Export version.



=== Products/CMFDefault/profiles/default/types/Discussion_Item.xml 1.1.2.1 => 
1.1.2.2 ===
--- Products/CMFDefault/profiles/default/types/Discussion_Item.xml:1.1.2.1      
Sun Nov 28 15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/Discussion_Item.xml      Fri Jul 
 1 09:27:44 2005
@@ -1,14 +1,18 @@
 <?xml version="1.0"?>
 <type-info id="Discussion Item"
-           kind="Factory-based Type Information"
-           title="Discussion Item"
-           meta_type="Discussion Item"
-           icon="discussionitem_icon.gif" immediate_view=""
-           filter_content_types="True"
-           allow_discussion="False" global_allow="True"
-           product="" factory="">
-  <description>Discussion Items are documents which reply to other content.
-They should *not* be addable through the standard 'folder_factories' 
interface.</description>
+           kind="Factory-based Type Information">
+  <property name="title">Discussion Item</property>
+  <property name="description">Discussion Items are documents which reply to 
other content.
+They should *not* be addable through the standard 'folder_factories' 
interface.</property>
+  <property name="content_icon">discussionitem_icon.gif</property>
+  <property name="content_meta_type">Discussion Item</property>
+  <property name="product"></property>
+  <property name="factory"></property>
+  <property name="immediate_view"></property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types"></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="(Default)" to="discussionitem_view"/>
    <alias from="view" to="discussionitem_view"/>


=== Products/CMFDefault/profiles/default/types/Document.xml 1.1.2.1 => 1.1.2.2 
===
--- Products/CMFDefault/profiles/default/types/Document.xml:1.1.2.1     Sun Nov 
28 15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/Document.xml     Fri Jul  1 
09:27:44 2005
@@ -1,14 +1,18 @@
 <?xml version="1.0"?>
 <type-info id="Document"
-           kind="Factory-based Type Information"
-           title="Document" meta_type="Document"
-           icon="document_icon.gif"
-           immediate_view="metadata_edit_form"
-           filter_content_types="True"
-           allow_discussion="False" global_allow="True"
-           product="CMFDefault" factory="addDocument">
-  <description>Documents contain text that can be formatted using 'Structured 
Text.'
-They may also contain HTML, or "plain" text.</description>
+           kind="Factory-based Type Information">
+  <property name="title">Document</property>
+  <property name="description">Documents contain text that can be formatted 
using 'Structured Text.'
+They may also contain HTML, or "plain" text.</property>
+  <property name="content_icon">document_icon.gif</property>
+  <property name="content_meta_type">Document</property>
+  <property name="product">CMFDefault</property>
+  <property name="factory">addDocument</property>
+  <property name="immediate_view">metadata_edit_form</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types"></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="gethtml" to="source_html"/>
    <alias from="(Default)" to="document_view"/>


=== Products/CMFDefault/profiles/default/types/Favorite.xml 1.1.2.1 => 1.1.2.2 
===
--- Products/CMFDefault/profiles/default/types/Favorite.xml:1.1.2.1     Sun Nov 
28 15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/Favorite.xml     Fri Jul  1 
09:27:44 2005
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
 <type-info id="Favorite"
-           kind="Factory-based Type Information"
-           title="Favorite" meta_type="Favorite"
-           icon="link_icon.gif"
-           immediate_view="metadata_edit_form"
-           filter_content_types="True"
-           allow_discussion="False" global_allow="True"
-           product="CMFDefault" factory="addFavorite">
-  <description>A Favorite is a Link to an intra-portal resource.</description>
+           kind="Factory-based Type Information">
+  <property name="title">Favorite</property>
+  <property name="description">A Favorite is a Link to an intra-portal 
resource.</property>
+  <property name="content_icon">link_icon.gif</property>
+  <property name="content_meta_type">Favorite</property>
+  <property name="product">CMFDefault</property>
+  <property name="factory">addFavorite</property>
+  <property name="immediate_view">metadata_edit_form</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types"></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="(Default)" to="favorite_view"/>
    <alias from="view" to="favorite_view"/>


=== Products/CMFDefault/profiles/default/types/File.xml 1.1.2.1 => 1.1.2.2 ===
--- Products/CMFDefault/profiles/default/types/File.xml:1.1.2.1 Sun Nov 28 
15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/File.xml Fri Jul  1 09:27:44 2005
@@ -1,12 +1,16 @@
 <?xml version="1.0"?>
-<type-info id="File" kind="Factory-based Type Information"
-           title="File" meta_type="Portal File"
-           icon="file_icon.gif"
-           immediate_view="metadata_edit_form"
-           filter_content_types="True"
-           allow_discussion="False" global_allow="True"
-           product="CMFDefault" factory="addFile">
-  <description>File objects can contain arbitrary downloadable 
files.</description>
+<type-info id="File" kind="Factory-based Type Information">
+  <property name="title">File</property>
+  <property name="description">File objects can contain arbitrary downloadable 
files.</property>
+  <property name="content_icon">file_icon.gif</property>
+  <property name="content_meta_type">Portal File</property>
+  <property name="product">CMFDefault</property>
+  <property name="factory">addFile</property>
+  <property name="immediate_view">metadata_edit_form</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types"></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="(Default)" to="index_html"/>
    <alias from="view" to="file_view"/>


=== Products/CMFDefault/profiles/default/types/Folder.xml 1.1.2.1 => 1.1.2.2 ===
--- Products/CMFDefault/profiles/default/types/Folder.xml:1.1.2.1       Sun Nov 
28 15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/Folder.xml       Fri Jul  1 
09:27:44 2005
@@ -1,13 +1,16 @@
 <?xml version="1.0"?>
-<type-info id="Folder" kind="Factory-based Type Information"
-           title="Folder" meta_type="Portal Folder"
-           icon="folder_icon.gif"
-           immediate_view="folder_edit_form"
-           filter_content_types="False"
-           allow_discussion="False" global_allow="True"
-           product="CMFCore"
-           factory="manage_addPortalFolder">
-  <description>Use folders to put content in categories.</description>
+<type-info id="Folder" kind="Factory-based Type Information">
+  <property name="title">Folder</property>
+  <property name="description">Use folders to put content in 
categories.</property>
+  <property name="content_icon">folder_icon.gif</property>
+  <property name="content_meta_type">Portal Folder</property>
+  <property name="product">CMFCore</property>
+  <property name="factory">manage_addPortalFolder</property>
+  <property name="immediate_view">folder_edit_form</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">False</property>
+  <property name="allowed_content_types"></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="index.html" to="index_html"/>
    <alias from="(Default)" to="index_html"/>


=== Products/CMFDefault/profiles/default/types/Image.xml 1.1.2.1 => 1.1.2.2 ===
--- Products/CMFDefault/profiles/default/types/Image.xml:1.1.2.1        Sun Nov 
28 15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/Image.xml        Fri Jul  1 
09:27:44 2005
@@ -1,12 +1,16 @@
 <?xml version="1.0"?>
-<type-info id="Image" kind="Factory-based Type Information"
-           title="Image" meta_type="Portal Image"
-           icon="image_icon.gif"
-           immediate_view="metadata_edit_form"
-           filter_content_types="True"
-           allow_discussion="False" global_allow="True"
-           product="CMFDefault" factory="addImage">
-  <description>Image objects can be embedded in Portal documents.</description>
+<type-info id="Image" kind="Factory-based Type Information">
+  <property name="title">Image</property>
+  <property name="description">Image objects can be embedded in Portal 
documents.</property>
+  <property name="content_icon">image_icon.gif</property>
+  <property name="content_meta_type">Portal Image</property>
+  <property name="product">CMFDefault</property>
+  <property name="factory">addImage</property>
+  <property name="immediate_view">metadata_edit_form</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types"></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="(Default)" to="index_html"/>
    <alias from="view" to="image_view"/>


=== Products/CMFDefault/profiles/default/types/Link.xml 1.1.2.1 => 1.1.2.2 ===
--- Products/CMFDefault/profiles/default/types/Link.xml:1.1.2.1 Sun Nov 28 
15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/Link.xml Fri Jul  1 09:27:44 2005
@@ -1,12 +1,16 @@
 <?xml version="1.0"?>
-<type-info id="Link" kind="Factory-based Type Information"
-           title="Link" meta_type="Link"
-           icon="link_icon.gif"
-           immediate_view="metadata_edit_form"
-           filter_content_types="True"
-           allow_discussion="False" global_allow="True"
-           product="CMFDefault" factory="addLink">
-  <description>Link items are annotated URLs.</description>
+<type-info id="Link" kind="Factory-based Type Information">
+  <property name="title">Link</property>
+  <property name="description">Link items are annotated URLs.</property>
+  <property name="content_icon">link_icon.gif</property>
+  <property name="content_meta_type">Link</property>
+  <property name="product">CMFDefault</property>
+  <property name="factory">addLink</property>
+  <property name="immediate_view">metadata_edit_form</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types"></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="(Default)" to="link_view"/>
    <alias from="view" to="link_view"/>


=== Products/CMFDefault/profiles/default/types/News_Item.xml 1.1.2.1 => 1.1.2.2 
===
--- Products/CMFDefault/profiles/default/types/News_Item.xml:1.1.2.1    Sun Nov 
28 15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/News_Item.xml    Fri Jul  1 
09:27:45 2005
@@ -1,14 +1,18 @@
 <?xml version="1.0"?>
 <type-info id="News Item"
-           kind="Factory-based Type Information"
-           title="News Item" meta_type="News Item"
-           icon="newsitem_icon.gif"
-           immediate_view="metadata_edit_form"
-           filter_content_types="True"
-           allow_discussion="False" global_allow="True"
-           product="CMFDefault" factory="addNewsItem">
-  <description>News Items contain short text articles and carry a title as 
well as
-an optional description.</description>
+           kind="Factory-based Type Information">
+  <property name="title">News Item</property>
+  <property name="description">News Items contain short text articles and 
carry a title as well as
+an optional description.</property>
+  <property name="content_icon">newsitem_icon.gif</property>
+  <property name="content_meta_type">News Item</property>
+  <property name="product">CMFDefault</property>
+  <property name="factory">addNewsItem</property>
+  <property name="immediate_view">metadata_edit_form</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types"></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="gethtml" to="source_html"/>
    <alias from="(Default)" to="newsitem_view"/>


=== Products/CMFDefault/profiles/default/types/Topic.xml 1.1.2.1 => 1.1.2.2 ===
--- Products/CMFDefault/profiles/default/types/Topic.xml:1.1.2.1        Sun Nov 
28 15:05:55 2004
+++ Products/CMFDefault/profiles/default/types/Topic.xml        Fri Jul  1 
09:27:45 2005
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
-<type-info id="Topic" kind="Factory-based Type Information"
-           title="Topic" meta_type="Portal Topic"
-           icon="topic_icon.gif"
-           immediate_view="topic_edit_form"
-           filter_content_types="True"
-           allow_discussion="False" global_allow="True"
-           product="CMFTopic" factory="addTopic">
-  <description>Topics are canned queries for organizing content with up to 
date queries into the catalog.</description>
-  <allowed_content_type>Topic</allowed_content_type>
+<type-info id="Topic" kind="Factory-based Type Information">
+  <property name="title">Topic</property>
+  <property name="description">Topics are canned queries for organizing 
content with up to date queries into the catalog.</property>
+  <property name="content_icon">topic_icon.gif</property>
+  <property name="content_meta_type">Portal Topic</property>
+  <property name="product">CMFTopic</property>
+  <property name="factory">addTopic</property>
+  <property name="immediate_view">topic_edit_form</property>
+  <property name="global_allow">True</property>
+  <property name="filter_content_types">True</property>
+  <property name="allowed_content_types">
+   <element value="Topic" /></property>
+  <property name="allow_discussion">False</property>
   <aliases>
    <alias from="(Default)" to="topic_view"/>
    <alias from="view" to="topic_view"/>

_______________________________________________
CMF-checkins mailing list
[email protected]
http://mail.zope.org/mailman/listinfo/cmf-checkins

Reply via email to