[Erp5-report] r12487 - in /erp5/trunk/products/CMFActivity: ./ Activity/

[nobody at svn.erp5.org]

Author: seb
Date: Wed Jan 31 18:10:38 2007
New Revision: 12487

URL: http://svn.erp5.org?rev=12487&view=rev
Log:
move ActivityFlushError to CMFAcitivity/Errors.py, also added ActivityPendingError

Modified:
    erp5/trunk/products/CMFActivity/Activity/SQLDict.py
    erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
    erp5/trunk/products/CMFActivity/__init__.py

Modified: erp5/trunk/products/CMFActivity/Activity/SQLDict.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLDict.py?rev=12487&r1=12486&r2=12487&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLDict.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLDict.py Wed Jan 31 18:10:38 2007
@@ -32,6 +32,7 @@
 from Queue import VALID, INVALID_ORDER, INVALID_PATH, EXCEPTION, MAX_PROCESSING_TIME, VALIDATION_ERROR_DELAY
 from RAMDict import RAMDict
 from Products.CMFActivity.ActiveObject import DISTRIBUTABLE_STATE, INVOKE_ERROR_STATE, VALIDATE_ERROR_STATE
+from Products.CMFActivity.Errors import ActivityFlushError
 from ZODB.POSException import ConflictError
 import sys
 import sha
@@ -54,8 +55,6 @@
   [4] * 5 + \
   [5] * 1
 
-class ActivityFlushError(Exception):
-    """Error during active message flush"""
 
 class SQLDict(RAMDict):
   """

Modified: erp5/trunk/products/CMFActivity/Activity/SQLQueue.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/SQLQueue.py?rev=12487&r1=12486&r2=12487&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/SQLQueue.py (original)
+++ erp5/trunk/products/CMFActivity/Activity/SQLQueue.py Wed Jan 31 18:10:38 2007
@@ -32,6 +32,7 @@
 from DateTime import DateTime
 from Queue import VALID, INVALID_ORDER, INVALID_PATH, EXCEPTION, MAX_PROCESSING_TIME, VALIDATION_ERROR_DELAY
 from Products.CMFActivity.ActiveObject import DISTRIBUTABLE_STATE, INVOKE_ERROR_STATE, VALIDATE_ERROR_STATE
+from Products.CMFActivity.Errors import ActivityFlushError
 from ZODB.POSException import ConflictError
 from types import StringType, ClassType
 import sys
@@ -51,9 +52,6 @@
   [3] * 10 + \
   [4] * 5 + \
   [5] * 1
-
-class ActivityFlushError(Exception):
-    """Error during active message flush"""
 
 class SQLQueue(RAMQueue):
   """

Modified: erp5/trunk/products/CMFActivity/__init__.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/__init__.py?rev=12487&r1=12486&r2=12487&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/__init__.py (original)
+++ erp5/trunk/products/CMFActivity/__init__.py Wed Jan 31 18:10:38 2007
@@ -53,3 +53,6 @@
 # This is used by a script (external method) that can be run
 # to set up CMFActivity in an existing CMF Site instance.
 cmfactivity_globals = globals()
+
+from AccessControl.SecurityInfo import allow_module
+allow_module('Products.CMFActivity.Errors')