From c282ad6f176a764a78a0130b0390769363d7b88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Thu, 1 Mar 2007 14:01:40 +0000
Subject: [PATCH] rename cache, core to content and user_interface to ui

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13138 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_caches/erp5_content_long.xml       | 108 ++++++++++++++++++
 .../default_ram_cache.xml                     |   0
 .../portal_caches/erp5_content_medium.xml     | 108 ++++++++++++++++++
 .../default_ram_cache.xml                     |   0
 ...r_interface.xml => erp5_content_short.xml} |   4 +-
 .../default_ram_cache.xml                     |   0
 .../portal_caches/erp5_ui_long.xml            | 108 ++++++++++++++++++
 .../default_ram_cache.xml                     |   0
 .../portal_caches/erp5_ui_medium.xml          | 108 ++++++++++++++++++
 .../default_ram_cache.xml                     |   0
 .../portal_caches/erp5_ui_short.xml           | 108 ++++++++++++++++++
 .../default_ram_cache.xml                     |   0
 .../erp5_core/Base_doLanguage.xml             |   2 +-
 .../erp5_core/Base_getFieldDescription.xml    |   2 +-
 .../BusinessTemplate_getDiffObjectList.xml    |   2 +-
 .../BusinessTemplate_getModifiedObject.xml    |   2 +-
 .../erp5_core/ERP5Site_getModuleItemList.xml  |   2 +-
 .../TemplateTool_getModifiedObjectList.xml    |   2 +-
 product/ERP5/bootstrap/erp5_core/bt/revision  |   2 +-
 .../bootstrap/erp5_core/bt/template_path_list |  24 ++--
 20 files changed, 561 insertions(+), 21 deletions(-)
 create mode 100644 product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long.xml
 rename product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/{erp5_core_long => erp5_content_long}/default_ram_cache.xml (100%)
 create mode 100644 product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium.xml
 rename product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/{erp5_core_medium => erp5_content_medium}/default_ram_cache.xml (100%)
 rename product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/{erp5_user_interface.xml => erp5_content_short.xml} (95%)
 rename product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/{erp5_core_short => erp5_content_short}/default_ram_cache.xml (100%)
 create mode 100644 product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long.xml
 rename product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/{erp5_user_interface_long => erp5_ui_long}/default_ram_cache.xml (100%)
 create mode 100644 product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium.xml
 rename product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/{erp5_user_interface_medium => erp5_ui_medium}/default_ram_cache.xml (100%)
 create mode 100644 product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short.xml
 rename product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/{erp5_user_interface_short => erp5_ui_short}/default_ram_cache.xml (100%)

diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long.xml
new file mode 100644
index 0000000000..7dc7bd621e
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.Document.CacheFactory</string>
+          <string>CacheFactory</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>cache_duration</string> </key>
+            <value> <int>36000</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_content_long</string> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>3</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Cache Factory</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Content Long</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.Length</string>
+          <string>Length</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_core_long/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_core_long/default_ram_cache.xml
rename to product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_long/default_ram_cache.xml
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium.xml
new file mode 100644
index 0000000000..4f88b83c28
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.Document.CacheFactory</string>
+          <string>CacheFactory</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>cache_duration</string> </key>
+            <value> <int>3600</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_content_medium</string> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>3</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Cache Factory</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Content Medium</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.Length</string>
+          <string>Length</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_core_medium/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_core_medium/default_ram_cache.xml
rename to product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_medium/default_ram_cache.xml
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short.xml
similarity index 95%
rename from product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface.xml
rename to product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short.xml
index 5c56e47ecc..270f98be19 100644
--- a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface.xml
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short.xml
@@ -42,7 +42,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>erp5_user_interface</string> </value>
+            <value> <string>erp5_content_short</string> </value>
         </item>
         <item>
             <key> <string>last_id</string> </key>
@@ -54,7 +54,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Default User Interface</string> </value>
+            <value> <string>Content Short</string> </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_core_short/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_core_short/default_ram_cache.xml
rename to product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_content_short/default_ram_cache.xml
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long.xml
new file mode 100644
index 0000000000..c81790b7e6
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.Document.CacheFactory</string>
+          <string>CacheFactory</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>cache_duration</string> </key>
+            <value> <int>36000</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_ui_long</string> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>3</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Cache Factory</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>User Interface Long</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.Length</string>
+          <string>Length</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface_long/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface_long/default_ram_cache.xml
rename to product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_long/default_ram_cache.xml
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium.xml
new file mode 100644
index 0000000000..343e3a5473
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.Document.CacheFactory</string>
+          <string>CacheFactory</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>cache_duration</string> </key>
+            <value> <int>3600</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_ui_medium</string> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>3</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Cache Factory</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>User Interface Medium</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.Length</string>
+          <string>Length</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface_medium/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface_medium/default_ram_cache.xml
rename to product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_medium/default_ram_cache.xml
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short.xml
new file mode 100644
index 0000000000..706e50d7da
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>Products.ERP5Type.Document.CacheFactory</string>
+          <string>CacheFactory</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>cache_duration</string> </key>
+            <value> <int>300</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>erp5_ui_short</string> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>3</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Cache Factory</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>User Interface Short (Default)</string> </value>
+        </item>
+        <item>
+            <key> <string>uid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.Length</string>
+          <string>Length</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>BTrees.OOBTree</string>
+          <string>OOBTree</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface_short/default_ram_cache.xml b/product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_user_interface_short/default_ram_cache.xml
rename to product/ERP5/bootstrap/erp5_core/PathTemplateItem/portal_caches/erp5_ui_short/default_ram_cache.xml
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doLanguage.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doLanguage.xml
index 7e50ef9eb4..50ca39fd63 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doLanguage.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doLanguage.xml
@@ -75,7 +75,7 @@ portal = context.getPortalObject()\n
 portal.Localizer.changeLanguage(language_select)\n
 \n
 # XXX should invalidate cached data specific to current user\n
-clearCache()\n
+clearCache(cache_factory_list=("erp5_ui_short",))\n
 </string> </value>
         </item>
         <item>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getFieldDescription.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getFieldDescription.xml
index acad62eb97..5a01990372 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getFieldDescription.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getFieldDescription.xml
@@ -85,7 +85,7 @@ def getFieldDescription():\n
   return desc\n
 \n
 getFieldDescription = CachingMethod(getFieldDescription, \\\n
-       (\'getFieldDescription\', field.aq_parent.getId(), field.getId()), cache_factory=\'erp5_user_interface_long\')\n
+       (\'getFieldDescription\', field.aq_parent.getId(), field.getId()), cache_factory=\'erp5_ui_long\')\n
 \n
 return getFieldDescription()\n
 </string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffObjectList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffObjectList.xml
index 11518699de..36574a1546 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffObjectList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getDiffObjectList.xml
@@ -104,7 +104,7 @@ def getModifiedObjectList(bt1, bt2):\n
   return bt1.preinstall(compare_to=bt2)\n
 \n
 getModifiedObjectList = CachingMethod(getModifiedObjectList, id=\'BusinessTemplate_getModifiedObjectList\', \\\n
-                        cache_factory=\'erp5_user_interface_medium\')\n
+                        cache_factory=\'erp5_ui_medium\')\n
 \n
 if p.portal_templates.compareVersions(bt1.getVersion(), bt2.getVersion()) < 0:\n
   modified_object_list = getModifiedObjectList(bt2, bt1)\n
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
index 7f7b0851bd..17bbe0e078 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_getModifiedObject.xml
@@ -77,7 +77,7 @@ def getModifiedObjectList(context):\n
 \n
 getModifiedObjectList = CachingMethod(getModifiedObjectList,\n
                               id=\'BusinessTemplate_getModifiedObjectList\',\n
-                              cache_factory=\'erp5_user_interface_medium\')\n
+                              cache_factory=\'erp5_ui_medium\')\n
 \n
 modified_object_list = getModifiedObjectList(context)\n
 keys = modified_object_list.keys()\n
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.xml
index a482ab631c..e855792b60 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.xml
@@ -87,7 +87,7 @@ def getModuleItemList(user=None, portal_path=None):\n
 \n
 getModuleItemList = CachingMethod(getModuleItemList,  \n
   id=(\'ERP5Site_getModuleItemList\', context.Localizer.get_selected_language()),\n
-  cache_factory=\'erp5_user_interface_short\')\n
+  cache_factory=\'erp5_ui_short\')\n
 portal_path = context.getPortalObject().getPhysicalPath()\n
 return getModuleItemList(user=user, portal_path=portal_path)\n
 </string> </value>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml
index 03786e9835..f0103bf6a2 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_getModifiedObjectList.xml
@@ -87,7 +87,7 @@ def getModifiedObjectList(bt):\n
   return bt.preinstall(check_dependencies = check_dependencies)\n
 \n
 getModifiedObjectList = CachingMethod(getModifiedObjectList, id=\'BusinessTemplate_getModifiedObjectList\', \\\n
-                                      cache_factory=\'erp5_user_interface_medium\')\n
+                                      cache_factory=\'erp5_ui_medium\')\n
 \n
 bt_objects = {}\n
 \n
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index ddc17b20b7..bb81456fa1 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-260
\ No newline at end of file
+262
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_path_list b/product/ERP5/bootstrap/erp5_core/bt/template_path_list
index faaae18095..bc3e67a2de 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_path_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_path_list
@@ -1,13 +1,13 @@
-portal_caches/erp5_core_long
-portal_caches/erp5_core_long/default_ram_cache
-portal_caches/erp5_core_medium
-portal_caches/erp5_core_medium/default_ram_cache
-portal_caches/erp5_core_short
-portal_caches/erp5_core_short/default_ram_cache
-portal_caches/erp5_user_interface_long
-portal_caches/erp5_user_interface_long/default_ram_cache
-portal_caches/erp5_user_interface_medium
-portal_caches/erp5_user_interface_medium/default_ram_cache
-portal_caches/erp5_user_interface_short
-portal_caches/erp5_user_interface_short/default_ram_cache
+portal_caches/erp5_content_long
+portal_caches/erp5_content_long/default_ram_cache
+portal_caches/erp5_content_medium
+portal_caches/erp5_content_medium/default_ram_cache
+portal_caches/erp5_content_short
+portal_caches/erp5_content_short/default_ram_cache
+portal_caches/erp5_ui_long
+portal_caches/erp5_ui_long/default_ram_cache
+portal_caches/erp5_ui_medium
+portal_caches/erp5_ui_medium/default_ram_cache
+portal_caches/erp5_ui_short
+portal_caches/erp5_ui_short/default_ram_cache
 portal_preferences/default_site_preference
\ No newline at end of file
-- 
2.30.9