From 9523b4c6b5299ccf03f7c8c520cfe2ec009654e6 Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Mon, 13 Mar 2006 16:04:28 +0000
Subject: [PATCH] Use the right MySQL connection. Rebuild BT on devel website,
 not on local copy.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6083 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_mysql/z_catalog_fulltext_list.xml    |  6 +-
 bt5/erp5_web/LocalRolesTemplateItem/.xml      |  2 +-
 .../ModuleTemplateItem/web_page_module.xml    | 96 +++++++++++++------
 .../ModuleTemplateItem/web_site_module.xml    | 96 +++++++++++++------
 .../erp5_web/WebSite_createContent.xml        |  4 +-
 .../erp5_web/WebSite_getBreadcrumb.xml        |  4 +-
 .../erp5_web/WebSite_getDocumentList.xml      |  4 +-
 .../erp5_web/WebSite_getMainSection.xml       |  4 +-
 .../erp5_web/WebSite_getMainSectionList.xml   |  4 +-
 .../portal_skins/erp5_web/WebSite_getSite.xml |  4 +-
 10 files changed, 154 insertions(+), 70 deletions(-)

diff --git a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
index fbb3f2f7de..6d6a908ca0 100755
--- a/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
+++ b/bt5/erp5_web/CatalogMethodTemplateItem/portal_catalog/erp5_mysql/z_catalog_fulltext_list.xml
@@ -51,8 +51,8 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>uid</string>
-                            <string>SearchableText</string>
+<string>uid</string>
+<string>SearchableText</string>
                           </list>
                         </value>
                     </item>
@@ -98,7 +98,7 @@ SearchableText</string> </value>
         </item>
         <item>
             <key> <string>connection_id</string> </key>
-            <value> <string>erp5_sql_connection</string> </value>
+            <value> <string>erp5_deferred_mysql</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_web/LocalRolesTemplateItem/.xml b/bt5/erp5_web/LocalRolesTemplateItem/.xml
index 6986525ec1..9ce7af19be 100755
--- a/bt5/erp5_web/LocalRolesTemplateItem/.xml
+++ b/bt5/erp5_web/LocalRolesTemplateItem/.xml
@@ -1,6 +1,6 @@
 <local_roles_item>
  <local_roles>
-  <role id='vincent'>
+  <role id='jp'>
    <item>Owner</item>
   </role>
  </local_roles>
diff --git a/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml b/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
index 0bd2f4b394..99eb545993 100755
--- a/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
+++ b/bt5/erp5_web/ModuleTemplateItem/web_page_module.xml
@@ -19,6 +19,9 @@
   <permission>
    <name>Access session data</name>
   </permission>
+  <permission>
+   <name>AccessContentsInformation</name>
+  </permission>
   <permission>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
@@ -26,10 +29,10 @@
    <name>Add BTreeFolder2s</name>
   </permission>
   <permission>
-   <name>Add Browser Id Manager</name>
+   <name>Add Base18 Tools</name>
   </permission>
   <permission>
-   <name>Add CMF Action Icons Tools</name>
+   <name>Add Browser Id Manager</name>
   </permission>
   <permission>
    <name>Add CMF Active Processs</name>
@@ -37,38 +40,32 @@
   <permission>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
-   <name>Add CMF Default Tools</name>
-  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
-   <name>Add CMF Setup Tools</name>
-  </permission>
   <permission>
    <name>Add CMF Sites</name>
   </permission>
   <permission>
-   <name>Add CMF Unique Id Tools</name>
+   <name>Add CMFActivity Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMFCalendar Tools</name>
   </permission>
   <permission>
    <name>Add CMFCategory Tools</name>
   </permission>
+  <permission>
+   <name>Add CMFDefault Tools</name>
+  </permission>
   <permission>
    <name>Add CMFMailIn Tools</name>
   </permission>
   <permission>
-   <name>Add Configured CMF Sites</name>
+   <name>Add CMFWiki Comment</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -118,6 +115,9 @@
   <permission>
    <name>Add ERP5Form Tools</name>
   </permission>
+  <permission>
+   <name>Add ERP5Shop Tools</name>
+  </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
   </permission>
@@ -151,6 +151,9 @@
   <permission>
    <name>Add Localizers</name>
   </permission>
+  <permission>
+   <name>Add MMM Shop Toolss</name>
+  </permission>
   <permission>
    <name>Add MailHost objects</name>
   </permission>
@@ -170,7 +173,7 @@
    <name>Add Pluggable Index</name>
   </permission>
   <permission>
-   <name>Add Plugin Registrys</name>
+   <name>Add Portal ZSyncer Tools</name>
   </permission>
   <permission>
    <name>Add Python Scripts</name>
@@ -223,6 +226,9 @@
   <permission>
    <name>Add ZODB Mount Points</name>
   </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
   <permission>
    <name>Add Zope Tutorials</name>
   </permission>
@@ -241,9 +247,15 @@
   <permission>
    <name>Add portal topics</name>
   </permission>
+  <permission>
+   <name>Add shop category</name>
+  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
   </permission>
+  <permission>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
   <permission>
    <name>Change DTML Documents</name>
   </permission>
@@ -307,9 +319,6 @@
   <permission>
    <name>Change configuration</name>
   </permission>
-  <permission>
-   <name>Change local roles</name>
-  </permission>
   <permission>
    <name>Change permissions</name>
   </permission>
@@ -322,9 +331,15 @@
   <permission>
    <name>Change proxy roles</name>
   </permission>
+  <permission>
+   <name>Checkout shopping cart</name>
+  </permission>
   <permission>
    <name>Copy or Move</name>
   </permission>
+  <permission>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission>
    <name>Create Transient Objects</name>
   </permission>
@@ -340,6 +355,12 @@
   <permission>
    <name>Download ExtFile/ExtImage</name>
   </permission>
+  <permission>
+   <name>Download Product</name>
+  </permission>
+  <permission>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission>
    <name>Edit Factories</name>
   </permission>
@@ -376,15 +397,9 @@
   <permission>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
-   <name>Manage Groups</name>
-  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
   </permission>
@@ -400,6 +415,12 @@
   <permission>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
+  <permission>
+   <name>Manage currencies</name>
+  </permission>
+  <permission>
+   <name>Manage extensions</name>
+  </permission>
   <permission>
    <name>Manage languages</name>
   </permission>
@@ -412,15 +433,30 @@
   <permission>
    <name>Manage properties</name>
   </permission>
+  <permission>
+   <name>Manage shop</name>
+  </permission>
+  <permission>
+   <name>Manage shop catalog</name>
+  </permission>
+  <permission>
+   <name>Manage shop category</name>
+  </permission>
   <permission>
    <name>Manage users</name>
   </permission>
+  <permission>
+   <name>Manage_messages</name>
+  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
   </permission>
   <permission>
    <name>Modify portal content</name>
   </permission>
+  <permission>
+   <name>Move CMFWiki Page</name>
+  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
   </permission>
@@ -448,9 +484,6 @@
   <permission>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
-   <name>Search for principals</name>
-  </permission>
   <permission>
    <name>Set own password</name>
   </permission>
@@ -499,6 +532,15 @@
   <permission>
    <name>WebDAV access</name>
   </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
+  <permission>
+   <name>ZopeProfiler: manage</name>
+  </permission>
+  <permission>
+   <name>ZopeProfiler: view</name>
+  </permission>
  </permission_list>
  <portal_type>Web Page Module</portal_type>
  <title>Web Pages</title>
diff --git a/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml b/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
index d3e269261e..a2471405a1 100755
--- a/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
+++ b/bt5/erp5_web/ModuleTemplateItem/web_site_module.xml
@@ -19,6 +19,9 @@
   <permission>
    <name>Access session data</name>
   </permission>
+  <permission>
+   <name>AccessContentsInformation</name>
+  </permission>
   <permission>
    <name>Add Accelerated HTTP Cache Managers</name>
   </permission>
@@ -26,10 +29,10 @@
    <name>Add BTreeFolder2s</name>
   </permission>
   <permission>
-   <name>Add Browser Id Manager</name>
+   <name>Add Base18 Tools</name>
   </permission>
   <permission>
-   <name>Add CMF Action Icons Tools</name>
+   <name>Add Browser Id Manager</name>
   </permission>
   <permission>
    <name>Add CMF Active Processs</name>
@@ -37,38 +40,32 @@
   <permission>
    <name>Add CMF Caching Policy Managers</name>
   </permission>
-  <permission>
-   <name>Add CMF Calendar Tools</name>
-  </permission>
   <permission>
    <name>Add CMF Core Tools</name>
   </permission>
-  <permission>
-   <name>Add CMF Default Tools</name>
-  </permission>
   <permission>
    <name>Add CMF Report Tools</name>
   </permission>
-  <permission>
-   <name>Add CMF Setup Tools</name>
-  </permission>
   <permission>
    <name>Add CMF Sites</name>
   </permission>
   <permission>
-   <name>Add CMF Unique Id Tools</name>
+   <name>Add CMFActivity Tools</name>
   </permission>
   <permission>
-   <name>Add CMFActivity Tools</name>
+   <name>Add CMFCalendar Tools</name>
   </permission>
   <permission>
    <name>Add CMFCategory Tools</name>
   </permission>
+  <permission>
+   <name>Add CMFDefault Tools</name>
+  </permission>
   <permission>
    <name>Add CMFMailIn Tools</name>
   </permission>
   <permission>
-   <name>Add Configured CMF Sites</name>
+   <name>Add CMFWiki Comment</name>
   </permission>
   <permission>
    <name>Add Content Type Registrys</name>
@@ -118,6 +115,9 @@
   <permission>
    <name>Add ERP5Form Tools</name>
   </permission>
+  <permission>
+   <name>Add ERP5Shop Tools</name>
+  </permission>
   <permission>
    <name>Add ERP5SyncML Tools</name>
   </permission>
@@ -151,6 +151,9 @@
   <permission>
    <name>Add Localizers</name>
   </permission>
+  <permission>
+   <name>Add MMM Shop Toolss</name>
+  </permission>
   <permission>
    <name>Add MailHost objects</name>
   </permission>
@@ -170,7 +173,7 @@
    <name>Add Pluggable Index</name>
   </permission>
   <permission>
-   <name>Add Plugin Registrys</name>
+   <name>Add Portal ZSyncer Tools</name>
   </permission>
   <permission>
    <name>Add Python Scripts</name>
@@ -223,6 +226,9 @@
   <permission>
    <name>Add ZODB Mount Points</name>
   </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
   <permission>
    <name>Add Zope Tutorials</name>
   </permission>
@@ -241,9 +247,15 @@
   <permission>
    <name>Add portal topics</name>
   </permission>
+  <permission>
+   <name>Add shop category</name>
+  </permission>
   <permission>
    <name>Change Browser Id Manager</name>
   </permission>
+  <permission>
+   <name>Change CMFWiki Regulations</name>
+  </permission>
   <permission>
    <name>Change DTML Documents</name>
   </permission>
@@ -307,9 +319,6 @@
   <permission>
    <name>Change configuration</name>
   </permission>
-  <permission>
-   <name>Change local roles</name>
-  </permission>
   <permission>
    <name>Change permissions</name>
   </permission>
@@ -322,9 +331,15 @@
   <permission>
    <name>Change proxy roles</name>
   </permission>
+  <permission>
+   <name>Checkout shopping cart</name>
+  </permission>
   <permission>
    <name>Copy or Move</name>
   </permission>
+  <permission>
+   <name>Create CMFWiki Page</name>
+  </permission>
   <permission>
    <name>Create Transient Objects</name>
   </permission>
@@ -340,6 +355,12 @@
   <permission>
    <name>Download ExtFile/ExtImage</name>
   </permission>
+  <permission>
+   <name>Download Product</name>
+  </permission>
+  <permission>
+   <name>Edit CMFWiki Page</name>
+  </permission>
   <permission>
    <name>Edit Factories</name>
   </permission>
@@ -376,15 +397,9 @@
   <permission>
    <name>Manage Access Rules</name>
   </permission>
-  <permission>
-   <name>Manage Groups</name>
-  </permission>
   <permission>
    <name>Manage Transient Object Container</name>
   </permission>
-  <permission>
-   <name>Manage Translation Services</name>
-  </permission>
   <permission>
    <name>Manage Vocabulary</name>
   </permission>
@@ -400,6 +415,12 @@
   <permission>
    <name>Manage ZCatalogIndex Entries</name>
   </permission>
+  <permission>
+   <name>Manage currencies</name>
+  </permission>
+  <permission>
+   <name>Manage extensions</name>
+  </permission>
   <permission>
    <name>Manage languages</name>
   </permission>
@@ -412,15 +433,30 @@
   <permission>
    <name>Manage properties</name>
   </permission>
+  <permission>
+   <name>Manage shop</name>
+  </permission>
+  <permission>
+   <name>Manage shop catalog</name>
+  </permission>
+  <permission>
+   <name>Manage shop category</name>
+  </permission>
   <permission>
    <name>Manage users</name>
   </permission>
+  <permission>
+   <name>Manage_messages</name>
+  </permission>
   <permission>
    <name>Modify Cookie Crumblers</name>
   </permission>
   <permission>
    <name>Modify portal content</name>
   </permission>
+  <permission>
+   <name>Move CMFWiki Page</name>
+  </permission>
   <permission>
    <name>Open/Close Database Connection</name>
   </permission>
@@ -448,9 +484,6 @@
   <permission>
    <name>Search ZCatalog</name>
   </permission>
-  <permission>
-   <name>Search for principals</name>
-  </permission>
   <permission>
    <name>Set own password</name>
   </permission>
@@ -499,6 +532,15 @@
   <permission>
    <name>WebDAV access</name>
   </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
+  <permission>
+   <name>ZopeProfiler: manage</name>
+  </permission>
+  <permission>
+   <name>ZopeProfiler: view</name>
+  </permission>
  </permission_list>
  <portal_type>Web Site Module</portal_type>
  <title>Web Sites</title>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml
index e200f48bb2..32306b3b11 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_createContent.xml
@@ -14,7 +14,7 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value> <string encoding="base64">O/INCg==</string> </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -100,7 +100,7 @@ return request.RESPONSE.redirect( redirect_url )\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_createContent</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_createContent</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml
index f6f08b551e..7a065a7b89 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getBreadcrumb.xml
@@ -14,7 +14,7 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value> <string encoding="base64">O/INCg==</string> </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -97,7 +97,7 @@ return \' &gt; \'.join(breadcrumb_list)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getBreadcrumb</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getBreadcrumb</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentList.xml
index f159c40f86..e38a6b1b9d 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentList.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getDocumentList.xml
@@ -14,7 +14,7 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value> <string encoding="base64">O/INCg==</string> </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -120,7 +120,7 @@ return brain_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getDocumentList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getDocumentList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSection.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSection.xml
index 5db5824916..e9332c4f30 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSection.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSection.xml
@@ -14,7 +14,7 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value> <string encoding="base64">O/INCg==</string> </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -87,7 +87,7 @@ return previous_section\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getMainSection</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getMainSection</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSectionList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSectionList.xml
index 3a7f3cf3bf..dcec647ab5 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSectionList.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getMainSectionList.xml
@@ -14,7 +14,7 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value> <string encoding="base64">O/INCg==</string> </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -88,7 +88,7 @@ return filter(lambda x: x.isVisible(), section_list)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getMainSectionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getMainSectionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
index 2bc1dedcd1..6db201108e 100755
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_getSite.xml
@@ -14,7 +14,7 @@
       <dictionary>
         <item>
             <key> <string>Python_magic</string> </key>
-            <value> <string encoding="base64">bfINCg==</string> </value>
+            <value> <string encoding="base64">O/INCg==</string> </value>
         </item>
         <item>
             <key> <string>Script_magic</string> </key>
@@ -81,7 +81,7 @@ return current_section\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_web/WebSite_getSite</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_web/WebSite_getSite</string> </value>
         </item>
         <item>
             <key> <string>_owner</string> </key>
-- 
2.30.9