[CMF-checkins] SVN: CMF/trunk/CMFDefault/profiles/default/ updated default profile from an export to minimize diffs

[Yvo Schubbe]

Log message for revision 39471:
  updated default profile from an export to minimize diffs

Changed:
  UU  CMF/trunk/CMFDefault/profiles/default/contenttyperegistry.xml
  U   CMF/trunk/CMFDefault/profiles/default/export_steps.xml
  U   CMF/trunk/CMFDefault/profiles/default/import_steps.xml
  U   CMF/trunk/CMFDefault/profiles/default/toolset.xml

-=-
Modified: CMF/trunk/CMFDefault/profiles/default/contenttyperegistry.xml
===================================================================
--- CMF/trunk/CMFDefault/profiles/default/contenttyperegistry.xml	2005-10-16 16:15:49 UTC (rev 39470)
+++ CMF/trunk/CMFDefault/profiles/default/contenttyperegistry.xml	2005-10-16 16:17:03 UTC (rev 39471)
@@ -1,36 +1,28 @@
 <?xml version="1.0"?>
 <content-type-registry>
- <predicate
-   predicate_id="link"
-   predicate_type="extension"
-   content_type_name="Link">
-  <argument value="url,link" />
+ <predicate predicate_id="link" predicate_type="extension"
+            content_type_name="Link">
+  <argument value="url,link"/>
  </predicate>
- <predicate
-   predicate_id="news"
-   predicate_type="extension"
-   content_type_name="News Item">
-  <argument value="news" />
+ <predicate predicate_id="news" predicate_type="extension"
+            content_type_name="News Item">
+  <argument value="news"/>
  </predicate>
- <predicate
-   predicate_id="document"
-   predicate_type="major_minor"
-   content_type_name="Document">
-  <argument value="text" />
-  <argument value="" />
+ <predicate predicate_id="document"
+            predicate_type="major_minor"
+            content_type_name="Document">
+  <argument value="text"/>
+  <argument value=""/>
  </predicate>
- <predicate
-   predicate_id="image"
-   predicate_type="major_minor"
-   content_type_name="Image">
-  <argument value="image" />
-  <argument value="" />
+ <predicate predicate_id="image"
+            predicate_type="major_minor"
+            content_type_name="Image">
+  <argument value="image"/>
+  <argument value=""/>
  </predicate>
- <predicate
-   predicate_id="file"
-   predicate_type="major_minor"
-   content_type_name="File">
-  <argument value="application" />
-  <argument value="" />
+ <predicate predicate_id="file" predicate_type="major_minor"
+            content_type_name="File">
+  <argument value="application"/>
+  <argument value=""/>
  </predicate>
 </content-type-registry>


Property changes on: CMF/trunk/CMFDefault/profiles/default/contenttyperegistry.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: CMF/trunk/CMFDefault/profiles/default/export_steps.xml
===================================================================
--- CMF/trunk/CMFDefault/profiles/default/export_steps.xml	2005-10-16 16:15:49 UTC (rev 39470)
+++ CMF/trunk/CMFDefault/profiles/default/export_steps.xml	2005-10-16 16:17:03 UTC (rev 39471)
@@ -5,11 +5,21 @@
               title="Action Providers">
   Export actions tool's action providers and their actions.
  </export-step>
+ <export-step id="caching_policy_mgr"
+              handler="Products.CMFSetup.cachingpolicymgr.exportCachingPolicyManager"
+              title="Caching Policies">
+  Export caching policy manager's policies.
+ </export-step>
  <export-step id="catalog"
               handler="Products.CMFSetup.catalog.exportCatalogTool"
               title="Catalog Tool">
   Export catalog tool's sub-objects, indexes and columns.
  </export-step>
+ <export-step id="content_type_registry"
+              handler="Products.CMFSetup.contenttyperegistry.exportContentTypeRegistry"
+              title="Content Type Registry">
+  Export content type registry's predicates / bindings.
+ </export-step>
  <export-step id="cookieauth"
               handler="Products.CMFSetup.cookieauth.exportCookieCrumbler"
               title="Cookie Authentication">
@@ -55,14 +65,4 @@
               title="Workflow Tool">
   Export workflow tool's workflow definitions and supporting scripts.
  </export-step>
- <export-step id="caching_policy_mgr"
-              handler="Products.CMFSetup.cachingpolicymgr.exportCachingPolicyManager"
-              title="Caching Policies">
-  Export cacing policy manager's policies.
- </export-step>
- <export-step id="content_type_registry"
-              handler="Products.CMFSetup.contenttyperegistry.exportContentTypeRegistry"
-              title="Content Type Registry">
-  Export content type registry's predicates / bindings.
- </export-step>
 </export-steps>

Modified: CMF/trunk/CMFDefault/profiles/default/import_steps.xml
===================================================================
--- CMF/trunk/CMFDefault/profiles/default/import_steps.xml	2005-10-16 16:15:49 UTC (rev 39470)
+++ CMF/trunk/CMFDefault/profiles/default/import_steps.xml	2005-10-16 16:17:03 UTC (rev 39471)
@@ -6,12 +6,25 @@
   <dependency step="toolset"/>
   Import actions tool's action providers and their actions.
  </import-step>
+ <import-step id="caching_policy_mgr" version="20051011-01"
+              handler="Products.CMFSetup.cachingpolicymgr.importCachingPolicyManager"
+              title="Caching Policies">
+  <dependency step="toolset"/>
+  Import caching policy manager's policies.
+ </import-step>
  <import-step id="catalog" version="20050929-01"
               handler="Products.CMFSetup.catalog.importCatalogTool"
               title="Catalog Tool">
   <dependency step="toolset"/>
   Import catalog tool's sub-objects, indexes and columns.
  </import-step>
+ <import-step id="content_type_registry"
+              version="20051013-01"
+              handler="Products.CMFSetup.contenttyperegistry.importContentTypeRegistry"
+              title="Content Type Registry">
+  <dependency step="toolset"/>
+  Import content type registry's predicates and bindings.
+ </import-step>
  <import-step id="cookie_authentication"
               version="20050903-01"
               handler="Products.CMFSetup.cookieauth.importCookieCrumbler"
@@ -66,16 +79,4 @@
   <dependency step="typeinfo"/>
   Import workflow tool's workflow definitions and supporting scripts.
  </import-step>
- <import-step id="caching_policy_mgr" version="20051011-01"
-              handler="Products.CMFSetup.cachingpolicymgr.importCachingPolicyManager"
-              title="Caching Policies">
-  <dependency step="toolset"/>
-  Import caching policy manager's policies.
- </import-step>
- <import-step id="content_type_registry" version="20051013-01"
-              handler="Products.CMFSetup.contenttyperegistry.importContentTypeRegistry"
-              title="Content Type Registry">
-  <dependency step="toolset"/>
-  Import content type registry's predicates and bindings.
- </import-step>
 </import-steps>

Modified: CMF/trunk/CMFDefault/profiles/default/toolset.xml
===================================================================
--- CMF/trunk/CMFDefault/profiles/default/toolset.xml	2005-10-16 16:15:49 UTC (rev 39470)
+++ CMF/trunk/CMFDefault/profiles/default/toolset.xml	2005-10-16 16:17:03 UTC (rev 39471)
@@ -3,12 +3,12 @@
 
  <required tool_id="MailHost"
            class="Products.MailHost.MailHost.MailHost"/>
- <required tool_id="cookie_authentication"
-           class="Products.CMFCore.CookieCrumbler.CookieCrumbler"/>
  <required tool_id="caching_policy_manager"
            class="Products.CMFCore.CachingPolicyManager.CachingPolicyManager"/>
  <required tool_id="content_type_registry"
            class="Products.CMFCore.ContentTypeRegistry.ContentTypeRegistry"/>
+ <required tool_id="cookie_authentication"
+           class="Products.CMFCore.CookieCrumbler.CookieCrumbler"/>
  <required tool_id="portal_actions"
            class="Products.CMFCore.ActionsTool.ActionsTool"/>
  <required tool_id="portal_catalog"