[Erp5-report] r42321 rafael - in /erp5/trunk/bt5/erp5_upgrader: SkinTemplateItem/portal_ski...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jan 14 04:22:44 CET 2011
Author: rafael
Date: Fri Jan 14 04:22:43 2011
New Revision: 42321
URL: http://svn.erp5.org?rev=42321&view=rev
Log:
Move the script list ran after upgrade to upgrader signature.
Removed:
erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeData.xml
Modified:
erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml
erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml
erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
erp5/trunk/bt5/erp5_upgrader/bt/revision
Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml?rev=42321&r1=42320&r2=42321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_senseFinalizeUpgrade.xml [utf8] Fri Jan 14 04:22:43 2011
@@ -63,41 +63,10 @@ alarm_dict = context.ERP5Site_getUpgrade
if not alarm_dict.get(context.getId(), True):\n
return False\n
\n
-# Verify if is required upgrade Global Site Properties. \n
-if len(context.ERP5Site_upgradeGlobalPropertyList()) > 0:\n
- return True\n
-\n
-if len(context.ERP5Site_upgradeValidationStateList()) > 0: \n
- return True\n
-\n
-if len(context.ERP5Site_upgradeWorkflowChain()) > 0:\n
- return True\n
-\n
-if len(context.ERP5Site_upgradeData()) > 0: \n
- return True\n
-\n
-if len(context.ERP5Site_upgradePortalTypePropertySheet()) > 0: \n
- return True\n
-\n
-if len(context.ERP5Site_upgradeSecurity()) > 0: \n
- return True\n
-\n
-if len(context.ERP5Site_upgradeObjectClass()) > 0: \n
- return True\n
-\n
-if len(context.ERP5Site_upgradeSQLCatalogFilter()) > 0: \n
- return True\n
-\n
-if len(context.ERP5Site_upgradeSQLCatalog()) > 0: \n
- return True\n
-\n
-if len(context.ERP5Site_upgradeAlarmToolConfiguration()) > 0:\n
- return True\n
-\n
-# (rafael) Maybe this is dangerous, enable it when this\n
-# is appropriated tested.\n
-#if len(context.ERP5Site_upgradeMySQLCharset()) > 0: \n
-# return True\n
+finalize_upgrade_script_list = context.ERP5Site_getUpgraderSignature(\'finalize_upgrade_script_list\')\n
+for script_id in finalize_upgrade_script_list:\n
+ if len(getattr(context, script_id)()) > O:\n
+ return True\n
\n
return False\n
@@ -105,70 +74,13 @@ return False\n
]]></string> </value>
</item>
<item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
</item>
<item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>kw</string>
- <string>_getattr_</string>
- <string>context</string>
- <string>alarm_dict</string>
- <string>True</string>
- <string>False</string>
- <string>len</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>id</string> </key>
<value> <string>Alarm_senseFinalizeUpgrade</string> </value>
</item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
</dictionary>
</pickle>
</record>
Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml?rev=42321&r1=42320&r2=42321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/Alarm_upgradeFinalize.xml [utf8] Fri Jan 14 04:22:43 2011
@@ -82,27 +82,8 @@ if bt5_upgrader_sense:\n
severity=0,\n
detail=\'BT5 Upgrader Sense: %s\' % (bt5_upgrader_sense))\n
\n
-# Verify if is required upgrade Global Site Properties. \n
-message_list.extend(context.ERP5Site_upgradeGlobalPropertyList(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradeWorkflowChain(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradeValidationStateList(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradeData(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradePortalTypePropertySheet(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradeSecurity(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradeMySQLCharset(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradeSQLCatalogFilter(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradeObjectClass(upgrade=1))\n
-\n
-message_list.extend(context.ERP5Site_upgradeAlarmToolConfiguration(upgrade=1))\n
-\n
+for script_id in context.ERP5Site_getUpgraderSignature(\'finalize_upgrade_script_list\'):\n
+ message_list.extend(getattr(context, script_id)(upgrade=1))\n
\n
# Verify if there was any change previously and \n
if len(message_list) > 0:\n
@@ -129,78 +110,13 @@ return message_list\n
]]></string> </value>
</item>
<item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>_params</string> </key>
<value> <string>**kw</string> </value>
</item>
<item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>kw</string>
- <string>_getattr_</string>
- <string>context</string>
- <string>dict</string>
- <string>clear_cache_kw</string>
- <string>portal_alarms</string>
- <string>activate</string>
- <string>active_process</string>
- <string>None</string>
- <string>message_list</string>
- <string>bt5_upgrader_sense</string>
- <string>len</string>
- <string>_write_</string>
- <string>_apply_</string>
- <string>_getitem_</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>id</string> </key>
<value> <string>Alarm_upgradeFinalize</string> </value>
</item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
</dictionary>
</pickle>
</record>
Modified: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml?rev=42321&r1=42320&r2=42321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_getUpgraderSignature.xml [utf8] Fri Jan 14 04:22:43 2011
@@ -156,7 +156,6 @@ REQUIRED_BT5_ID_LIST = ()\n
# After the bt5 be updated, update catalog will be trigger.\n
UPDATE_CATALOG_BT5_ID_LIST = ()\n
\n
-\n
# Call some scripts inside same transaction before or after BT update\n
BEFORE_TRIGGERED_BT5_SCRIPT_ID_DICT = {}\n
AFTER_TRIGGERED_BT5_SCRIPT_ID_DICT = {\'erp5_mysql_innodb_catalog\': (\'ERP5Site_updateSitePropertyForTestOnly\',)}\n
@@ -164,8 +163,7 @@ AFTER_TRIGGERED_BT5_SCRIPT_ID_DICT = {\'
# A list bt5 which require reinstallation\n
# ie. the upgrader will call reinstall\n
# on each of them and revert all local changes.\n
-REINSTALABLE_BT5_ID_LIST = (\'erp5_odt_style\',\n
-)\n
+REINSTALABLE_BT5_ID_LIST = ()\n
\n
# A snapshot of workflow chains which are known to be valid\n
# this snapshot will be generated automatically from release\n
@@ -287,6 +285,21 @@ INTEGRITY_VERIFICATION_SCRIPT_ID_LIST =
\'ERP5Site_verifySQLCatalogFilterIntegrity\',\n
\'ERP5Site_verifyActivityIntegrity\')\n
\n
+#\n
+# List of Scripts to be sense and run after business template be upgraded. This can\n
+# be consider as After methods.\n
+ \n
+FINALIZE_ALARM_SCRIPT = ( \'ERP5Site_upgradeGlobalPropertyList\',\n
+ \'ERP5Site_upgradeValidationStateList\',\n
+ \'ERP5Site_upgradeWorkflowChain\',\n
+ \'ERP5Site_upgradePortalTypePropertySheet\',\n
+ \'ERP5Site_upgradeSecurity\',\n
+ \'ERP5Site_upgradeObjectClass\',\n
+ \'ERP5Site_upgradeSQLCatalogFilter\',\n
+ \'ERP5Site_upgradeAlarmToolConfiguration\',\n
+ #\'ERP5Site_upgradeMySQLCharset\',\n
+ )\n
+\n
# \n
# Define the property and value ({\'property\' : \'value\', ...} to be set or created \n
# into erp5 portal object.\n
Removed: erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeData.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeData.xml?rev=42320&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeData.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/ERP5Site_upgradeData.xml (removed)
@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>"""\n
- Place for add upgrade of Data or objects.\n
- This can be changed to a alarm in future and it will \n
- probably be constantly overwriten everytime that it \n
- is needed in another folder.\n
-"""\n
-\n
-# By default it is never need to do data upgrade.\n
-return []\n
-</string> </value>
- </item>
- <item>
- <key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>upgrade=[]</string> </value>
- </item>
- <item>
- <key> <string>errors</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>func_code</string> </key>
- <value>
- <object>
- <klass>
- <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>co_varnames</string> </key>
- <value>
- <tuple>
- <string>upgrade</string>
- </tuple>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>func_defaults</string> </key>
- <value>
- <tuple>
- <list/>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>ERP5Site_upgradeData</string> </value>
- </item>
- <item>
- <key> <string>warnings</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_upgrader/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_upgrader/bt/revision?rev=42321&r1=42320&r2=42321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_upgrader/bt/revision [utf8] Fri Jan 14 04:22:43 2011
@@ -1 +1 @@
-556
\ No newline at end of file
+557
\ No newline at end of file
More information about the Erp5-report
mailing list