[CMF-checkins] CVS: CMF/CMFStaging - permissions.py:1.2 LockTool.py:1.17 StagingTool.py:1.25 VersionsTool.py:1.18 WorkflowRepository.py:1.3

[Tres Seaver]

Update of /cvs-repository/CMF/CMFStaging
In directory cvs.zope.org:/tmp/cvs-serv25166/CMFStaging

Modified Files:
	LockTool.py StagingTool.py VersionsTool.py 
	WorkflowRepository.py 
Added Files:
	permissions.py 
Log Message:
 - Merge tseaver-permissiongeddon-branch.


=== CMF/CMFStaging/permissions.py 1.1 => 1.2 ===
--- /dev/null	Thu Apr 29 12:13:52 2004
+++ CMF/CMFStaging/permissions.py	Thu Apr 29 12:13:21 2004
@@ -0,0 +1,21 @@
+from AccessControl import ModuleSecurityInfo
+
+security = ModuleSecurityInfo('Products.CMFStaging.permissions')
+
+security.declarePublic('ManagePortal')
+from Products.CMFCore.permissions import ManagePortal
+
+security.declarePublic('ModifyPortalContent')
+from Products.CMFCore.permissions import ModifyPortalContent
+
+security.declarePublic('StageObjects')
+StageObjects = 'Use version control'
+
+security.declarePublic('UseVersionControl')
+UseVersionControl = 'Use version control'
+
+security.declarePublic('LockObjects')
+LockObjects = 'WebDAV Lock items'
+
+security.declarePublic('UnlockObjects')
+UnlockObjects = 'WebDAV Unlock items'


=== CMF/CMFStaging/LockTool.py 1.16 => 1.17 ===
--- CMF/CMFStaging/LockTool.py:1.16	Thu Jan 29 18:12:54 2004
+++ CMF/CMFStaging/LockTool.py	Thu Apr 29 12:13:21 2004
@@ -22,21 +22,24 @@
 import os
 
 from Acquisition import aq_parent
-from Globals import InitializeClass, DTMLFile
-from AccessControl import ClassSecurityInfo, getSecurityManager
-from Products.CMFCore.utils import UniqueObject, getToolByName, \
-     SimpleItemWithProperties, _checkPermission
-from Products.CMFCore.CMFCorePermissions import ManagePortal, \
-     ModifyPortalContent
+from Globals import InitializeClass
+from Globals import DTMLFile
+from AccessControl import ClassSecurityInfo
+from AccessControl import getSecurityManager
 from webdav.WriteLockInterface import WriteLockInterface
 from webdav.LockItem import LockItem
 from zExceptions import Unauthorized
 
-from staging_utils import verifyPermission
+from Products.CMFCore.utils import UniqueObject
+from Products.CMFCore.utils import getToolByName
+from Products.CMFCore.utils import SimpleItemWithProperties
+from Products.CMFCore.utils import _checkPermission
 
-# Permission names
-LockObjects = 'WebDAV Lock items'
-UnlockObjects = 'WebDAV Unlock items'
+from permissions import ManagePortal
+from permissions import ModifyPortalContent
+from permissions import LockObjects
+from permissions import UnlockObjects
+from staging_utils import verifyPermission
 
 _wwwdir = os.path.join(os.path.dirname(__file__), 'www') 
 


=== CMF/CMFStaging/StagingTool.py 1.24 => 1.25 ===
--- CMF/CMFStaging/StagingTool.py:1.24	Wed Apr 28 15:03:50 2004
+++ CMF/CMFStaging/StagingTool.py	Thu Apr 29 12:13:21 2004
@@ -22,20 +22,23 @@
 
 from Acquisition import aq_base, aq_inner, aq_parent, aq_acquire
 from Acquisition import ImplicitAcquisitionWrapper
-from Globals import InitializeClass, DTMLFile
+from Globals import InitializeClass
+from Globals import DTMLFile
 from AccessControl import ClassSecurityInfo
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
-from Products.CMFCore.utils \
-     import UniqueObject, getToolByName, SimpleItemWithProperties
-from Products.CMFCore.CMFCorePermissions import ManagePortal
+from Products.CMFCore.utils import UniqueObject
+from Products.CMFCore.utils import getToolByName
+from Products.CMFCore.utils import SimpleItemWithProperties
 
-from staging_utils import getPortal, verifyPermission, unproxied
-from staging_utils import getProxyReference, cloneByPickle
+from permissions import ManagePortal
+from permissions import StageObjects
+from staging_utils import getPortal
+from staging_utils import verifyPermission
+from staging_utils import unproxied
+from staging_utils import getProxyReference
+from staging_utils import cloneByPickle
 
-
-# Permission name
-StageObjects = 'Use version control'
 
 _wwwdir = os.path.join(os.path.dirname(__file__), 'www')
 


=== CMF/CMFStaging/VersionsTool.py 1.17 => 1.18 ===
--- CMF/CMFStaging/VersionsTool.py:1.17	Wed Apr 21 10:15:04 2004
+++ CMF/CMFStaging/VersionsTool.py	Thu Apr 29 12:13:21 2004
@@ -23,14 +23,15 @@
 from Acquisition import aq_acquire
 from Globals import InitializeClass, DTMLFile
 from AccessControl import ClassSecurityInfo
-from Products.CMFCore.utils import UniqueObject, SimpleItemWithProperties
-from Products.CMFCore.CMFCorePermissions import ManagePortal
 
-from staging_utils import getPortal, verifyPermission, unproxied
+from Products.CMFCore.utils import UniqueObject
+from Products.CMFCore.utils import SimpleItemWithProperties
 
-
-# Permission name
-UseVersionControl = 'Use version control'
+from permissions import ManagePortal
+from permissions import UseVersionControl
+from staging_utils import getPortal
+from staging_utils import verifyPermission
+from staging_utils import unproxied
 
 _wwwdir = os.path.join(os.path.dirname(__file__), 'www')
 


=== CMF/CMFStaging/WorkflowRepository.py 1.2 => 1.3 ===
--- CMF/CMFStaging/WorkflowRepository.py:1.2	Mon Oct 27 15:21:53 2003
+++ CMF/CMFStaging/WorkflowRepository.py	Thu Apr 29 12:13:21 2004
@@ -18,12 +18,15 @@
 
 import os
 
-import Globals
+from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
-from Products.CMFCore.utils import getToolByName, SimpleItemWithProperties
-from Products.CMFCore.CMFCorePermissions import ManagePortal
-from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from BTrees.OOBTree import OOBTree
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+
+from Products.CMFCore.utils import getToolByName
+from Products.CMFCore.utils import SimpleItemWithProperties
+
+from permissions import ManagePortal
 
 _www = os.path.join(os.path.dirname(__file__), 'www')
 
@@ -59,7 +62,7 @@
     def countHistories(self):
         return len(self._histories)
 
-Globals.InitializeClass(WorkflowRepository)
+InitializeClass(WorkflowRepository)
 
 
 manage_addWorkflowRepositoryForm = PageTemplateFile(