cleanup: stop passing obsolete 'passive_commit' parameters to CMFActivity

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/InventoryModule_reindexMovementList.xml

@@ -69,7 +69,7 @@ for inventory in portal.portal_catalog(portal_type=portal.getPortalInventoryType
                                        sql_catalog_id=sql_catalog_id):\n
   inventory = inventory.getObject()\n
   tag = \'inventory_%i\' % inventory.getUid()\n
-  activate_kw = dict(tag=tag, passive_commit=passive_commit)\n
+  activate_kw = {\'tag\': tag}\n
   if previous_tag is not None:\n
     activate_kw[\'after_tag\'] = previous_tag\n
   previous_tag = tag\n
@@ -82,7 +82,7 @@ if final_activity_tag is not None and previous_tag is not None:\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>sql_catalog_id=None, passive_commit=1, final_activity_tag=None, **kw</string> </value>
+            <value> <string>sql_catalog_id=None, final_activity_tag=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_banking_core/bt/revision

-584
+585
\ No newline at end of file

bt5/erp5_csv_style/SkinTemplateItem/portal_skins/erp5_csv_core/Base_importCsvFile.xml

@@ -105,7 +105,7 @@ for line in iter(import_file.readline, ""):\n
   attribute_value_dict = dict([(csv_property_list[x], csv_data_list[x]) \\\n
                                for x in xrange(len(csv_property_list))])\n
 \n
-  method(priority=4, activity="SQLQueue", passive_commit=1).Base_importCsvLine(attribute_value_dict)\n
+  method(priority=4, activity="SQLQueue").Base_importCsvLine(attribute_value_dict)\n
 redirect_url = \'%s?%s\' % ( context.absolute_url()+\'/\'+\'view\', \'portal_status_message=Importing+CSV+file.\')\n
 request[ \'RESPONSE\' ].redirect( redirect_url )\n
 </string> </value>

bt5/erp5_csv_style/bt/revision

-16
+17
\ No newline at end of file

product/CMFActivity/ActiveObject.py

@@ -62,7 +62,7 @@ class ActiveObject(ExtensionClass.Base):
   security = ClassSecurityInfo()
 
   def activate(self, activity=DEFAULT_ACTIVITY, active_process=None,
-               passive_commit=0, activate_kw=None, **kw):
+               activate_kw=None, **kw):
     """Returns an active wrapper for this object.
 
       Reserved Optional parameters:

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml

@@ -67,7 +67,6 @@ context.portal_preferences.activate(\n
                                          object_tag=tag,\n
                                          object_priority=additional_priority,\n
                                          sql_catalog_id=sql_catalog_id,\n
-                                         passive_commit=passive_commit,\n
                                          start_tree=start_tree,\n
                                          stop_tree=stop_tree,)\n
 \n
@@ -85,7 +84,6 @@ if person_module is not None :\n
                                          object_tag=tag,\n
                                          object_priority=higher_priority,\n
                                          sql_catalog_id=sql_catalog_id,\n
-                                         passive_commit=passive_commit,\n
                                          start_tree=start_tree,\n
                                          stop_tree=stop_tree,)\n
 \n
@@ -110,7 +108,6 @@ context.portal_categories.activate(\n
                                          object_after_tag=object_after_tag,\n
                                          object_priority=higher_priority,\n
                                          sql_catalog_id=sql_catalog_id,\n
-                                         passive_commit=passive_commit,\n
                                          start_tree=start_tree,\n
                                          stop_tree=stop_tree,)\n
 \n
@@ -132,7 +129,6 @@ for folder in [context.portal_alarms, context.portal_activities]:\n
                                            object_after_tag=object_after_tag,\n
                                            object_priority=object_priority,\n
                                            sql_catalog_id=sql_catalog_id,\n
-                                           passive_commit=passive_commit,\n
                                            start_tree=start_tree,\n
                                            stop_tree=stop_tree,)\n
 \n
@@ -154,7 +150,6 @@ context.portal_simulation.activate(\n
                                          object_after_tag=object_after_tag,\n
                                          object_priority=higher_priority,\n
                                          sql_catalog_id=sql_catalog_id,\n
-                                         passive_commit=passive_commit,\n
                                          start_tree=start_tree,\n
                                          stop_tree=stop_tree,)\n
 \n
@@ -209,7 +204,6 @@ for folder in tool_list:\n
                                            object_after_tag=object_after_tag,\n
                                            object_priority=object_priority,\n
                                            sql_catalog_id=sql_catalog_id,\n
-                                           passive_commit=passive_commit,\n
                                            start_tree=start_tree,\n
                                            stop_tree=stop_tree,)\n
 \n
@@ -227,7 +221,6 @@ for folder in portal.objectValues(("ERP5 Folder",)):\n
                                      object_after_tag=object_after_tag,\n
                                      object_priority=object_priority,\n
                                      sql_catalog_id=sql_catalog_id,\n
-                                     passive_commit=passive_commit,\n
                                      start_tree=start_tree,\n
                                      stop_tree=stop_tree,)\n
 \n
@@ -247,7 +240,6 @@ for folder in portal.objectValues(("ERP5 Folder",)):\n
                                      object_after_tag=object_after_tag,\n
                                      object_priority=object_priority,\n
                                      sql_catalog_id=sql_catalog_id,\n
-                                     passive_commit=passive_commit,\n
                                      start_tree=start_tree,\n
                                      stop_tree=stop_tree,)\n
 \n
@@ -257,7 +249,6 @@ context.portal_simulation.activate(\n
       priority=3 + additional_priority\n
       ).InventoryModule_reindexMovementList(\n
                             sql_catalog_id=sql_catalog_id,\n
-                            passive_commit=passive_commit,\n
                             final_activity_tag=\'last_inventory_activity\')\n
 \n
 if final_activity_tag is not None:\n
@@ -278,7 +269,7 @@ return printed\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>sql_catalog_id=None, additional_priority=0, passive_commit=1, clear_catalog=0, final_activity_tag=None, start_tree=None, stop_tree=None</string> </value>
+            <value> <string>sql_catalog_id=None, additional_priority=0, clear_catalog=0, final_activity_tag=None, start_tree=None, stop_tree=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_reindexAll.xml

@@ -57,7 +57,6 @@ folder = context\n
 activate_kw = {\n
   \'tag\': object_tag,\n
   \'after_tag\': folder_after_tag,\n
-  \'passive_commit\': passive_commit\n
 }\n
 for key, value in activate_kw.items():\n
   if value is None:\n
@@ -90,7 +89,6 @@ def Folder_reindexObjectList(id_list_list):\n
      folder_tag=bundle_tag,\n
      folder_after_tag=bundle_object_tag,\n
      sql_catalog_id=sql_catalog_id,\n
-     passive_commit=passive_commit,\n
   )\n
 archive_test_script = getattr(context.getPortalObject(), "Archive_test", None)\n
 try:\n
@@ -155,7 +153,6 @@ else:\n
     folder_after_tag=bundle_object_tag,\n
     object_priority=object_priority,\n
     sql_catalog_id=sql_catalog_id,\n
-    passive_commit=passive_commit,\n
     object_tag=bundle_object_tag,\n
     tree_after_tag=tree_after_tag,\n
     tree_tag=tree_tag,\n
@@ -175,7 +172,7 @@ else:\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>folder_tag=None, folder_after_tag=None, object_tag=None, object_after_tag=None, object_priority=1, sql_catalog_id=None, passive_commit=1, start_tree=None, stop_tree=None</string> </value>
+            <value> <string>folder_tag=None, folder_after_tag=None, object_tag=None, object_after_tag=None, object_priority=1, sql_catalog_id=None, start_tree=None, stop_tree=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_reindexObjectList.xml

@@ -65,7 +65,6 @@ if id_list_list is not None:\n
 activate_kw = {\n
   \'tag\': object_tag,\n
   \'after_tag\': object_after_tag,\n
-  \'passive_commit\': passive_commit,\n
   \'priority\': object_priority\n
 }\n
 for key, value in activate_kw.items():\n
@@ -102,7 +101,6 @@ if id_list_list is not None:\n
          object_priority=object_priority,\n
          object_tag=object_tag,\n
          sql_catalog_id=sql_catalog_id,\n
-         passive_commit=passive_commit,\n
          folder_tag=folder_tag,\n
          folder_after_tag=folder_after_tag,\n
          count=count,\n
@@ -113,7 +111,7 @@ if id_list_list is not None:\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>id_list, id_list_list=None, folder_tag=None, folder_after_tag=None, object_tag=None, object_after_tag=None, object_priority=1, sql_catalog_id=None, passive_commit=1, count=None</string> </value>
+            <value> <string>id_list, id_list_list=None, folder_tag=None, folder_after_tag=None, object_tag=None, object_after_tag=None, object_priority=1, sql_catalog_id=None, count=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_reindexTreeObjectList.xml

@@ -63,14 +63,6 @@ if tree_id_list is not None:\n
     raise ValueError, "both tree and tree_id_list should not be defined"\n
   tree_id = tree_id_list.pop()\n
 \n
-activate_kw = {\n
-  \'passive_commit\': passive_commit\n
-}\n
-for key, value in activate_kw.items():\n
-  if value is None:\n
-    activate_kw.pop(key)\n
-\n
-\n
 # Spawn activities for bundles of content objects.\n
 # Bundle size, in object count\n
 BUNDLE_ITEM_COUNT = 1000\n
@@ -82,13 +74,12 @@ def Folder_reindexObjectList(id_list_list):\n
   """\n
   folder.activate(activity=\'SQLQueue\', priority=object_priority, \n
                   after_tag=object_tag,\n
-                  tag=folder_tag, **activate_kw).Folder_reindexObjectList(\n
+                  tag=folder_tag).Folder_reindexObjectList(\n
      None,\n
      id_list_list=id_list_list,\n
      object_priority=object_priority,\n
      object_tag=object_tag,\n
      sql_catalog_id=sql_catalog_id,\n
-     passive_commit=passive_commit,\n
      folder_tag=folder_tag,\n
      folder_after_tag=folder_after_tag,\n
   )\n
@@ -124,7 +115,6 @@ if tree_id_list is not None:\n
         object_priority=object_priority,\n
         sql_catalog_id=sql_catalog_id,\n
         object_tag=object_tag,\n
-        passive_commit=passive_commit,\n
         tree_after_tag=tree_after_tag,\n
         tree_tag=tree_tag,\n
         )\n
@@ -134,7 +124,7 @@ if tree_id_list is not None:\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>tree_id=None, tree_id_list=None, folder_tag=None, folder_after_tag=None, object_tag=None, object_after_tag=None, object_priority=1, sql_catalog_id=None, passive_commit=1, tree_tag=None, tree_after_tag=None</string> </value>
+            <value> <string>tree_id=None, tree_id_list=None, folder_tag=None, folder_after_tag=None, object_tag=None, object_after_tag=None, object_priority=1, sql_catalog_id=None, tree_tag=None, tree_after_tag=None</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/InventoryModule_reindexMovementList.xml

@@ -70,7 +70,7 @@ for inventory in portal.portal_catalog(portal_type=portal.getPortalInventoryType
                                        sql_catalog_id=sql_catalog_id):\n
   inventory = inventory.getObject()\n
   tag = \'inventory_%i\' % inventory.getUid()\n
-  activate_kw = dict(tag=tag, passive_commit=passive_commit)\n
+  activate_kw = {\'tag\': tag}\n
   if previous_tag is not None:\n
     activate_kw[\'after_tag\'] = previous_tag\n
   previous_tag = tag\n
@@ -83,7 +83,7 @@ if final_activity_tag is not None and previous_tag is not None:\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>sql_catalog_id=None, passive_commit=1, final_activity_tag=None, **kw</string> </value>
+            <value> <string>sql_catalog_id=None, final_activity_tag=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

product/ERP5/bootstrap/erp5_core/bt/revision

-41035
+41036
\ No newline at end of file

product/ERP5Catalog/Tool/ArchiveTool.py

@@ -213,8 +213,7 @@ class ArchiveTool(BaseTool):
 
     # Create inventory just before finish of hot reindexing
     inventory_date = archive.getStopDateRangeMax()
-    self.activate(passive_commit=1,
-                  after_method_id=('playBackRecordedObjectList'),
+    self.activate(after_method_id=('playBackRecordedObjectList'),
                   priority=5).runInventoryMethod(archive.id,
                                                  source_connection_id,
                                                  destination_sql_catalog_id,
@@ -222,8 +221,7 @@ class ArchiveTool(BaseTool):
                                                  )
     
 
-    self.activate(passive_commit=1,
-                  after_method_id=('runInventoryMethod'),
+    self.activate(after_method_id=('runInventoryMethod'),
                   after_tag="runInventoryMethod",
                   priority=5).InventoryModule_reindexMovementList(sql_catalog_id=destination_sql_catalog_id,
                                                                   final_activity_tag="InventoryModule_reindexMovementList"

product/ZSQLCatalog/ZSQLCatalog.py

@@ -364,14 +364,14 @@ class ZCatalog(Folder, Persistent, Implicit):
       # Re-schedule the same action in case there are remaining rows in the
       # table. This can happen if the database connector limits the number
       # of rows in the result.
-      self.activate(passive_commit=1, priority=5).\
+      self.activate(priority=5).\
           playBackRecordedObjectList(sql_catalog_id=sql_catalog_id,
                                      catalog=catalog)
     else:
       # If there iss nothing to do, go to next step.
       if catalog == 0:
         # If we were replaying unindex actions, time to replay index actions.
-        self.activate(passive_commit=1, priority=5).\
+        self.activate(priority=5).\
             playBackRecordedObjectList(sql_catalog_id=sql_catalog_id,
                                        catalog=1)
       # If we were replaying index actions, there is nothing else to do.
@@ -516,25 +516,21 @@ class ZCatalog(Folder, Persistent, Implicit):
     self.ERP5Site_reindexAll(sql_catalog_id=destination_sql_catalog_id,
                              final_activity_tag=final_activity_tag,
                              clear_catalog=1,
-                             additional_priority=1,
-                             passive_commit=1)
+                             additional_priority=1)
     # Once reindexing is finished, change the hot reindexing state so that
     # new catalog changes are applied in both catalogs.
-    self.activate(passive_commit=1,
-                  after_tag=final_activity_tag,
+    self.activate(after_tag=final_activity_tag,
                   priority=5).setHotReindexingState(HOT_REINDEXING_DOUBLE_INDEXING_STATE,
                       source_sql_catalog_id=source_sql_catalog_id,
                       destination_sql_catalog_id=destination_sql_catalog_id,
                       archive_path=archive_path)
     # Once in double-indexing mode, planned reindex can be replayed.
-    self.activate(passive_commit=1,
-                  after_method_id='setHotReindexingState',
+    self.activate(after_method_id='setHotReindexingState',
                   priority=5).playBackRecordedObjectList(
                       sql_catalog_id=destination_sql_catalog_id)
     # Once there is nothing to replay, databases are sync'ed, so the new
     # catalog can become current.
-    self.activate(passive_commit=1,
-                  after_method_id=('playBackRecordedObjectList',
+    self.activate(after_method_id=('playBackRecordedObjectList',
                                    'InventoryModule_reindexMovementList'),
                   after_tag='InventoryModule_reindexMovementList',
                   priority=5).finishHotReindexing(