[Erp5-report] r28997 - in /erp5/trunk/products: ERP5/PropertySheet/ ERP5Type/Core/ ERP5Type...
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Sep 13 00:04:36 CEST 2009
Author: jp
Date: Sun Sep 13 00:04:36 2009
New Revision: 28997
URL: http://svn.erp5.org?rev=28997&view=rev
Log:
Moved to ERP5Type some PropertySheets which are necessary for ERP5Type. It is not consistent for ERP5Type to depend on ERP5.
Added:
erp5/trunk/products/ERP5Type/PropertySheet/SortIndex.py
- copied unchanged from r28995, erp5/trunk/products/ERP5/PropertySheet/SortIndex.py
erp5/trunk/products/ERP5Type/PropertySheet/Url.py
- copied unchanged from r28995, erp5/trunk/products/ERP5/PropertySheet/Url.py
Removed:
erp5/trunk/products/ERP5/PropertySheet/SortIndex.py
erp5/trunk/products/ERP5/PropertySheet/Url.py
Modified:
erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py
erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py
erp5/trunk/products/ERP5Type/Core/RamCache.py
erp5/trunk/products/ERP5Type/PropertySheet/__init__.py
Removed: erp5/trunk/products/ERP5/PropertySheet/SortIndex.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/SortIndex.py?rev=28996&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/SortIndex.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/SortIndex.py (removed)
@@ -1,50 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2002 Coramy SAS and Contributors. All Rights Reserved.
-# Thierry Faucher <Thierry_Faucher at coramy.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-
-class SortIndex:
- """
- Discounts are used in orders, trade condition,...
- """
-
- _properties = (
- { 'id' : 'string_index',
- 'description' : 'a string which can be used to sort objects in a list',
- 'type' : 'string',
- 'mode' : 'w' },
- { 'id' : 'int_index',
- 'description' : 'an int which can be used to sort objects in a list',
- 'type' : 'int',
- 'mode' : 'w' },
- { 'id' : 'float_index',
- 'description' : 'a float which can be used to sort objects in a list',
- 'type' : 'float',
- 'mode' : 'w' },
- )
-
- _categories = ()
Removed: erp5/trunk/products/ERP5/PropertySheet/Url.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Url.py?rev=28996&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Url.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Url.py (removed)
@@ -1,46 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-# Jean-Paul Smets-Solanes <jp at nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-class Url:
- """
- Properties for Url Objects
- """
-
- _properties = (
- { 'id' : 'url_string',
- 'description' : 'url value',
- 'type' : 'string',
- 'mode' : 'w'
- },
- { 'id' : 'url_protocol',
- 'description' : 'for which protocol does this url hold',
- 'type' : 'string',
- 'mode' : 'r'
- }
- )
-
Modified: erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py?rev=28997&r1=28996&r2=28997&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/DistributedRamCache.py [utf8] Sun Sep 13 00:04:36 2009
@@ -31,9 +31,6 @@
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 @@
property_sheets = ( PropertySheet.Base
, PropertySheet.SimpleItem
, PropertySheet.Folder
- , SortIndex
- , BaseCache
- , DistributedRamCache
+ , PropertySheet.SortIndex
+ , PropertySheet.BaseCache
+ , PropertySheet.DistributedRamCache
)
Modified: erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py?rev=28997&r1=28996&r2=28997&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/MemcachedPlugin.py [utf8] Sun Sep 13 00:04:36 2009
@@ -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 @@
property_sheets = ( PropertySheet.Base
, PropertySheet.SimpleItem
, PropertySheet.Folder
- , MemcachedPlugin
- , SortIndex
- , Url
+ , PropertySheet.MemcachedPlugin
+ , PropertySheet.SortIndex
+ , PropertySheet.Url
)
def manage_beforeDelete(self, *args, **kw):
Modified: erp5/trunk/products/ERP5Type/Core/RamCache.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/RamCache.py?rev=28997&r1=28996&r2=28997&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/RamCache.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/RamCache.py [utf8] Sun Sep 13 00:04:36 2009
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2005 Nexedi SARL and Contributors. All Rights Reserved.
@@ -31,8 +32,6 @@
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 @@
property_sheets = ( PropertySheet.Base
, PropertySheet.SimpleItem
, PropertySheet.Folder
- , SortIndex
- , BaseCache
+ , PropertySheet.SortIndex
+ , PropertySheet.BaseCache
)
Modified: erp5/trunk/products/ERP5Type/PropertySheet/__init__.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/PropertySheet/__init__.py?rev=28997&r1=28996&r2=28997&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/PropertySheet/__init__.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/PropertySheet/__init__.py [utf8] Sun Sep 13 00:04:36 2009
@@ -8,3 +8,8 @@
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
More information about the Erp5-report
mailing list