Commit 1b11fadc authored by Ivan Tyagov's avatar Ivan Tyagov

Renamed Cache plugins

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11104 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d45e570e
...@@ -45,9 +45,9 @@ class CacheFactory(XMLObject): ...@@ -45,9 +45,9 @@ class CacheFactory(XMLObject):
isPortalContent = 1 isPortalContent = 1
isRADContent = 1 isRADContent = 1
allowed_types = ('ERP5 Ram Cache Plugin', allowed_types = ('ERP5 Ram Cache',
'ERP5 Distributed Ram Cache Plugin', 'ERP5 Distributed Ram Cache',
'ERP5 SQL Cache Plugin', 'ERP5 SQL Cache',
) )
security = ClassSecurityInfo() security = ClassSecurityInfo()
......
...@@ -31,17 +31,17 @@ from Products.CMFCore import CMFCorePermissions ...@@ -31,17 +31,17 @@ from Products.CMFCore import CMFCorePermissions
from Products.ERP5Type.XMLObject import XMLObject from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type import PropertySheet from Products.ERP5Type import PropertySheet
from Products.ERP5.PropertySheet.SortIndex import SortIndex from Products.ERP5.PropertySheet.SortIndex import SortIndex
from Products.ERP5Type.PropertySheet.BaseCachePlugin import BaseCachePlugin from Products.ERP5Type.PropertySheet.BaseCache import BaseCache
from Products.ERP5Type.PropertySheet.DistributedRamCachePlugin import DistributedRamCachePlugin from Products.ERP5Type.PropertySheet.DistributedRamCache import DistributedRamCache
class DistributedRamCachePlugin(XMLObject): class DistributedRamCache(XMLObject):
""" """
DistributedRamCachePlugin is a Zope (persistent) representation of DistributedRamCache is a Zope (persistent) representation of
the Distributed RAM Cache real cache plugin object. the Distributed RAM Cache real cache plugin object.
""" """
meta_type='ERP5 Distributed Ram Cache Plugin' meta_type='ERP5 Distributed Ram Cache'
portal_type='Distributed Ram Cache Plugin' portal_type='Distributed Ram Cache'
isPortalContent = 1 isPortalContent = 1
isRADContent = 1 isRADContent = 1
...@@ -57,7 +57,7 @@ class DistributedRamCachePlugin(XMLObject): ...@@ -57,7 +57,7 @@ class DistributedRamCachePlugin(XMLObject):
property_sheets = ( PropertySheet.Base property_sheets = ( PropertySheet.Base
, PropertySheet.SimpleItem , PropertySheet.SimpleItem
, PropertySheet.Folder , PropertySheet.Folder
, BaseCachePlugin , BaseCache
, SortIndex , SortIndex
, DistributedRamCachePlugin , DistributedRamCache
) )
...@@ -32,15 +32,15 @@ from Products.CMFCore import CMFCorePermissions ...@@ -32,15 +32,15 @@ from Products.CMFCore import CMFCorePermissions
from Products.ERP5Type.XMLObject import XMLObject from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type import PropertySheet from Products.ERP5Type import PropertySheet
from Products.ERP5.PropertySheet.SortIndex import SortIndex from Products.ERP5.PropertySheet.SortIndex import SortIndex
from Products.ERP5Type.PropertySheet.BaseCachePlugin import BaseCachePlugin from Products.ERP5Type.PropertySheet.BaseCache import BaseCache
class RamCachePlugin(XMLObject): class RamCache(XMLObject):
""" """
RamCachePlugin is a Zope (persistent) representation of RamCache is a Zope (persistent) representation of
the RAM based real cache plugin object. the RAM based real cache plugin object.
""" """
meta_type = 'ERP5 Ram Cache Plugin' meta_type = 'ERP5 Ram Cache'
portal_type = 'Ram Cache Plugin' portal_type = 'Ram Cache'
isPortalContent = 1 isPortalContent = 1
isRADContent = 1 isRADContent = 1
allowed_types = () allowed_types = ()
...@@ -56,5 +56,5 @@ class RamCachePlugin(XMLObject): ...@@ -56,5 +56,5 @@ class RamCachePlugin(XMLObject):
, PropertySheet.SimpleItem , PropertySheet.SimpleItem
, PropertySheet.Folder , PropertySheet.Folder
, SortIndex , SortIndex
, BaseCachePlugin , BaseCache
) )
...@@ -32,17 +32,17 @@ from Products.ERP5Type.Base import Base ...@@ -32,17 +32,17 @@ from Products.ERP5Type.Base import Base
from Products.ERP5Type.XMLObject import XMLObject from Products.ERP5Type.XMLObject import XMLObject
from Products.ERP5Type import PropertySheet from Products.ERP5Type import PropertySheet
from Products.ERP5.PropertySheet.SortIndex import SortIndex from Products.ERP5.PropertySheet.SortIndex import SortIndex
from Products.ERP5Type.PropertySheet.BaseCachePlugin import BaseCachePlugin from Products.ERP5Type.PropertySheet.BaseCache import BaseCache
from Products.ERP5Type.PropertySheet.SQLCachePlugin import SQLCachePlugin from Products.ERP5Type.PropertySheet.SQLCache import SQLCache
class SQLCachePlugin(XMLObject): class SQLCache(XMLObject):
""" """
SQLCachePlugin is a Zope (persistent) representation of SQLCache is a Zope (persistent) representation of
the RAM based real SQL cache plugin object. the RAM based real SQL cache plugin object.
""" """
meta_type = 'ERP5 SQL Cache Plugin' meta_type = 'ERP5 SQL Cache'
portal_type = 'SQL Cache Plugin' portal_type = 'SQL Cache'
isPortalContent = 1 isPortalContent = 1
isRADContent = 1 isRADContent = 1
...@@ -58,7 +58,7 @@ class SQLCachePlugin(XMLObject): ...@@ -58,7 +58,7 @@ class SQLCachePlugin(XMLObject):
property_sheets = ( PropertySheet.Base property_sheets = ( PropertySheet.Base
, PropertySheet.SimpleItem , PropertySheet.SimpleItem
, PropertySheet.Folder , PropertySheet.Folder
, BaseCachePlugin , BaseCache
, SortIndex , SortIndex
, SQLCachePlugin , SQLCache
) )
...@@ -74,9 +74,9 @@ class CacheTool(BaseTool): ...@@ -74,9 +74,9 @@ class CacheTool(BaseTool):
for cp in cf.getCachePluginList(): for cp in cf.getCachePluginList():
cache_obj = None cache_obj = None
cp_meta_type = cp.meta_type cp_meta_type = cp.meta_type
if cp_meta_type == 'ERP5 Ram Cache Plugin': if cp_meta_type == 'ERP5 Ram Cache':
cache_obj = RamCache() cache_obj = RamCache()
elif cp_meta_type == 'ERP5 Distributed Ram Cache Plugin': elif cp_meta_type == 'ERP5 Distributed Ram Cache':
## even thougn we have such plugin in ZODB that doens't mean ## even thougn we have such plugin in ZODB that doens't mean
## we have corresponding memcache module installed ## we have corresponding memcache module installed
if 'memcache' in globals().keys(): if 'memcache' in globals().keys():
...@@ -85,7 +85,7 @@ class CacheTool(BaseTool): ...@@ -85,7 +85,7 @@ class CacheTool(BaseTool):
## we don't have memcache python module installed ## we don't have memcache python module installed
## thus we can't use DistributedRamCache plugin ## thus we can't use DistributedRamCache plugin
cache_obj = None cache_obj = None
elif cp_meta_type == 'ERP5 SQL Cache Plugin': elif cp_meta_type == 'ERP5 SQL Cache':
## use connection details from 'erp5_sql_transactionless_connection' ZMySLQDA object ## use connection details from 'erp5_sql_transactionless_connection' ZMySLQDA object
connection_string = self.erp5_sql_transactionless_connection.connection_string connection_string = self.erp5_sql_transactionless_connection.connection_string
kw = self.parseDBConnectionString(connection_string) kw = self.parseDBConnectionString(connection_string)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment