From 07eaceb2c7ecf1434eafb11b28afea5f0f6a4712 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Sat, 12 Sep 2009 22:04:36 +0000
Subject: [PATCH] Moved to ERP5Type some PropertySheets which are necessary for
 ERP5Type. It is not consistent for ERP5Type to depend on ERP5.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28997 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5Type/Core/DistributedRamCache.py          | 9 +++------
 product/ERP5Type/Core/MemcachedPlugin.py              | 8 +++-----
 product/ERP5Type/Core/RamCache.py                     | 7 +++----
 product/{ERP5 => ERP5Type}/PropertySheet/SortIndex.py | 0
 product/{ERP5 => ERP5Type}/PropertySheet/Url.py       | 0
 product/ERP5Type/PropertySheet/__init__.py            | 5 +++++
 6 files changed, 14 insertions(+), 15 deletions(-)
 rename product/{ERP5 => ERP5Type}/PropertySheet/SortIndex.py (100%)
 rename product/{ERP5 => ERP5Type}/PropertySheet/Url.py (100%)

diff --git a/product/ERP5Type/Core/DistributedRamCache.py b/product/ERP5Type/Core/DistributedRamCache.py
index f8ca91227b..bca5d9d9c2 100644
--- a/product/ERP5Type/Core/DistributedRamCache.py
+++ b/product/ERP5Type/Core/DistributedRamCache.py
@@ -31,9 +31,6 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type import PropertySheet
 from Products.ERP5Type import Permissions
-from Products.ERP5.PropertySheet.SortIndex import SortIndex
-from Products.ERP5Type.PropertySheet.BaseCache import BaseCache
-from Products.ERP5Type.PropertySheet.DistributedRamCache import DistributedRamCache
 
 class DistributedRamCache(XMLObject):
   """
@@ -58,7 +55,7 @@ class DistributedRamCache(XMLObject):
   property_sheets = ( PropertySheet.Base
                     , PropertySheet.SimpleItem
                     , PropertySheet.Folder
-                    , SortIndex
-                    , BaseCache
-                    , DistributedRamCache
+                    , PropertySheet.SortIndex
+                    , PropertySheet.BaseCache
+                    , PropertySheet.DistributedRamCache
                     )
diff --git a/product/ERP5Type/Core/MemcachedPlugin.py b/product/ERP5Type/Core/MemcachedPlugin.py
index f7db3f62c9..692c5d10d4 100644
--- a/product/ERP5Type/Core/MemcachedPlugin.py
+++ b/product/ERP5Type/Core/MemcachedPlugin.py
@@ -30,8 +30,6 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type import PropertySheet
-from Products.ERP5.PropertySheet.SortIndex import SortIndex
-from Products.ERP5.PropertySheet.Url import Url
 from Products.ERP5Type.PropertySheet.MemcachedPlugin import MemcachedPlugin
 from Products.ERP5Type import Permissions
 from Products.ERP5Type.Tool.MemcachedTool import memcached_dict_pool
@@ -57,9 +55,9 @@ class MemcachedPlugin(XMLObject):
   property_sheets = ( PropertySheet.Base
                     , PropertySheet.SimpleItem
                     , PropertySheet.Folder
-                    , MemcachedPlugin
-                    , SortIndex
-                    , Url
+                    , PropertySheet.MemcachedPlugin
+                    , PropertySheet.SortIndex
+                    , PropertySheet.Url
                     )
 
   def manage_beforeDelete(self, *args, **kw):
diff --git a/product/ERP5Type/Core/RamCache.py b/product/ERP5Type/Core/RamCache.py
index c52f3f688c..130986447c 100644
--- a/product/ERP5Type/Core/RamCache.py
+++ b/product/ERP5Type/Core/RamCache.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2005 Nexedi SARL and Contributors. All Rights Reserved.
@@ -31,8 +32,6 @@ from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.XMLObject import XMLObject
 from Products.ERP5Type import PropertySheet
 from Products.ERP5Type import Permissions
-from Products.ERP5.PropertySheet.SortIndex import SortIndex
-from Products.ERP5Type.PropertySheet.BaseCache import BaseCache
 
 class RamCache(XMLObject):
   """
@@ -55,6 +54,6 @@ class RamCache(XMLObject):
   property_sheets = ( PropertySheet.Base
                     , PropertySheet.SimpleItem
                     , PropertySheet.Folder
-                    , SortIndex
-                    , BaseCache 
+                    , PropertySheet.SortIndex
+                    , PropertySheet.BaseCache
                     )
diff --git a/product/ERP5/PropertySheet/SortIndex.py b/product/ERP5Type/PropertySheet/SortIndex.py
similarity index 100%
rename from product/ERP5/PropertySheet/SortIndex.py
rename to product/ERP5Type/PropertySheet/SortIndex.py
diff --git a/product/ERP5/PropertySheet/Url.py b/product/ERP5Type/PropertySheet/Url.py
similarity index 100%
rename from product/ERP5/PropertySheet/Url.py
rename to product/ERP5Type/PropertySheet/Url.py
diff --git a/product/ERP5Type/PropertySheet/__init__.py b/product/ERP5Type/PropertySheet/__init__.py
index 7be1bd16e7..0276f44042 100644
--- a/product/ERP5Type/PropertySheet/__init__.py
+++ b/product/ERP5Type/PropertySheet/__init__.py
@@ -8,3 +8,8 @@ from BaseType import BaseType
 from ActionInformation import ActionInformation
 from RoleInformation import RoleInformation
 from TranslationInformation import TranslationInformation
+from SortIndex import SortIndex
+from BaseCache import BaseCache
+from DistributedRamCache import DistributedRamCache
+from Url import Url
+from MemcachedPlugin import MemcachedPlugin
-- 
2.30.9