From 6b2fd010b85634e1986df78c506a6516e2cb11aa Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date: Wed, 28 Aug 2013 11:02:22 +0900
Subject: [PATCH] ZODB Components: Migrate Documents, Extensions and Tests of
 most bt5s.

---
 .../extension.erp5.ERP5Administration.py}     |   0
 .../extension.erp5.ERP5Administration.xml     | 111 ++++
 .../extension.erp5.Security.py}               |   0
 .../extension.erp5.Security.xml               | 111 ++++
 bt5/erp5_administration/bt/change_log         |   3 +
 bt5/erp5_administration/bt/revision           |   2 +-
 .../bt/template_extension_id_list             |   4 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 .../document.erp5.ApparelAssortment.py}       |   0
 .../document.erp5.ApparelAssortment.xml       | 111 ++++
 .../document.erp5.ApparelCloth.py}            |   0
 .../document.erp5.ApparelCloth.xml            | 111 ++++
 .../document.erp5.ApparelColourRange.py}      |   0
 .../document.erp5.ApparelColourRange.xml      | 111 ++++
 .../document.erp5.ApparelComponent.py}        |   0
 .../document.erp5.ApparelComponent.xml        | 111 ++++
 .../document.erp5.ApparelFabric.py}           |   0
 .../document.erp5.ApparelFabric.xml           | 111 ++++
 .../document.erp5.ApparelMeasurement.py}      |   0
 .../document.erp5.ApparelMeasurement.xml      | 111 ++++
 .../document.erp5.ApparelModel.py}            |   0
 .../document.erp5.ApparelModel.xml            | 111 ++++
 .../document.erp5.ApparelShape.py}            |   0
 .../document.erp5.ApparelShape.xml            | 111 ++++
 .../document.erp5.ApparelSize.py}             |   0
 .../document.erp5.ApparelSize.xml             | 111 ++++
 bt5/erp5_apparel/bt/change_log                |   3 +
 bt5/erp5_apparel/bt/revision                  |   2 +-
 bt5/erp5_apparel/bt/template_document_id_list |  18 +-
 ..._keep_last_workflow_history_only_path_list |   9 +
 ...xtension.erp5.CheckbookReceptionImport.py} |   0
 ...xtension.erp5.CheckbookReceptionImport.xml | 136 +++++
 bt5/erp5_banking_check/bt/change_log          |   3 +
 bt5/erp5_banking_check/bt/revision            |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.Barcode.py}                |   0
 .../extension.erp5.Barcode.xml                | 111 ++++
 bt5/erp5_barcode/bt/change_log                |   3 +
 bt5/erp5_barcode/bt/revision                  |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.BarcodeUtils.py}           |   0
 .../extension.erp5.BarcodeUtils.xml           | 111 ++++
 .../extension.erp5.BaseMigration.py}          |   0
 .../extension.erp5.BaseMigration.xml          | 111 ++++
 bt5/erp5_base/bt/change_log                   |   5 +-
 bt5/erp5_base/bt/revision                     |   2 +-
 bt5/erp5_base/bt/template_extension_id_list   |   4 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 .../extension.erp5.BearerToken.py}            |   0
 .../extension.erp5.BearerToken.xml            | 111 ++++
 .../test.erp5.testERP5BearerToken.py}         |   0
 .../test.erp5.testERP5BearerToken.xml         | 111 ++++
 bt5/erp5_bearer_token/bt/change_log           |   3 +
 bt5/erp5_bearer_token/bt/revision             |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 .../bt/template_test_id_list                  |   2 +-
 .../document.erp5.Person.py}                  |   0
 .../document.erp5.Person.xml                  | 111 ++++
 bt5/erp5_certificate_authority/bt/change_log  |   3 +
 bt5/erp5_certificate_authority/bt/revision    |   2 +-
 .../bt/template_document_id_list              |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.Ecommerce.py}              |   0
 .../extension.erp5.Ecommerce.xml              | 111 ++++
 bt5/erp5_commerce/bt/change_log               |   3 +
 bt5/erp5_commerce/bt/revision                 |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 ....ConfigurationTemplate_readOOoCalcFile.py} |   0
 ....ConfigurationTemplate_readOOoCalcFile.xml | 111 ++++
 bt5/erp5_configurator/bt/change_log           |   3 +
 bt5/erp5_configurator/bt/revision             |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 ...rp5.testMaxmaDemoConfigurationWorkflow.py} |   0
 ...rp5.testMaxmaDemoConfigurationWorkflow.xml | 111 ++++
 .../bt/change_log                             |   3 +
 bt5/erp5_configurator_maxma_demo/bt/revision  |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 ...erp5.testRunMyDocConfigurationWorkflow.py} |   0
 ...erp5.testRunMyDocConfigurationWorkflow.xml | 111 ++++
 .../bt/change_log                             |   3 +
 bt5/erp5_configurator_run_my_doc/bt/revision  |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 ...erp5.testStandardConfigurationWorkflow.py} |   0
 ...erp5.testStandardConfigurationWorkflow.xml | 111 ++++
 bt5/erp5_configurator_standard/bt/change_log  |   3 +
 bt5/erp5_configurator_standard/bt/revision    |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 .../extension.erp5.ConfiguratorTestUtils.py}  |   0
 .../extension.erp5.ConfiguratorTestUtils.xml  | 111 ++++
 .../bt/change_log                             |   3 +
 .../bt/revision                               |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 ...test.erp5.testUNGConfigurationWorkflow.py} |   0
 ...test.erp5.testUNGConfigurationWorkflow.xml | 111 ++++
 bt5/erp5_configurator_ung/bt/change_log       |   3 +
 bt5/erp5_configurator_ung/bt/revision         |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 .../document.erp5.CredentialRecovery.py}      |   0
 .../document.erp5.CredentialRecovery.xml      | 111 ++++
 .../document.erp5.CredentialRequest.py}       |   0
 .../document.erp5.CredentialRequest.xml       | 111 ++++
 .../extension.erp5.Credential.py}             |   0
 .../extension.erp5.Credential.xml             | 111 ++++
 bt5/erp5_credential/bt/change_log             |   3 +
 bt5/erp5_credential/bt/revision               |   2 +-
 .../bt/template_document_id_list              |   4 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   3 +
 .../extension.erp5.CRMMigration.py}           |   0
 .../extension.erp5.CRMMigration.xml           | 111 ++++
 bt5/erp5_crm/bt/change_log                    |   3 +
 bt5/erp5_crm/bt/revision                      |   2 +-
 bt5/erp5_crm/bt/template_extension_id_list    |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 ...ension.erp5.DataProtectionRequestUtils.py} |   0
 ...ension.erp5.DataProtectionRequestUtils.xml | 111 ++++
 bt5/erp5_data_protection/bt/change_log        |   3 +
 bt5/erp5_data_protection/bt/revision          |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../document.erp5.DataSet.py}                 |   0
 .../document.erp5.DataSet.xml                 | 111 ++++
 bt5/erp5_data_set/bt/change_log               |   3 +
 bt5/erp5_data_set/bt/revision                 |   2 +-
 .../bt/template_document_id_list              |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.Development.py}            |   0
 .../extension.erp5.Development.xml            | 111 ++++
 bt5/erp5_development_wizard/bt/change_log     |   3 +
 bt5/erp5_development_wizard/bt/revision       |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.DocumentManagement.py}     |   0
 .../extension.erp5.DocumentManagement.xml     | 111 ++++
 .../extension.erp5.DocumentSecurity.py}       |   0
 .../extension.erp5.DocumentSecurity.xml       | 111 ++++
 bt5/erp5_dms/bt/change_log                    |   3 +
 bt5/erp5_dms/bt/revision                      |   2 +-
 bt5/erp5_dms/bt/template_extension_id_list    |   4 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 .../extension.erp5.DocumentConversion.py}     |   0
 .../extension.erp5.DocumentConversion.xml     | 111 ++++
 bt5/erp5_dms_conversion_catalog/bt/change_log |   3 +
 bt5/erp5_dms_conversion_catalog/bt/revision   |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../document.erp5.DummyDelivery.py}           |   0
 .../document.erp5.DummyDelivery.xml           | 111 ++++
 .../document.erp5.DummyMovement.py}           |   2 +-
 .../document.erp5.DummyMovement.xml           | 111 ++++
 bt5/erp5_dummy_movement/bt/change_log         |   3 +
 bt5/erp5_dummy_movement/bt/revision           |   2 +-
 .../bt/template_document_id_list              |   4 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 .../document.erp5.EGovTypeInformation.py}     |   0
 .../document.erp5.EGovTypeInformation.xml     | 111 ++++
 .../document.erp5.Person.py}                  |   0
 .../document.erp5.Person.xml                  | 111 ++++
 .../extension.erp5.Captcha.py}                |   0
 .../extension.erp5.Captcha.xml                | 111 ++++
 .../extension.erp5.EGovSecurity.py}           |   0
 .../extension.erp5.EGovSecurity.xml           | 111 ++++
 .../extension.erp5.ERP5EGov_Extensions.py}    |   0
 .../extension.erp5.ERP5EGov_Extensions.xml    | 111 ++++
 .../extension.erp5.SetUpEGovInstance.py}      |   0
 .../extension.erp5.SetUpEGovInstance.xml      | 111 ++++
 .../test.erp5.TestEGovMixin.py}               |   0
 .../test.erp5.TestEGovMixin.xml               | 111 ++++
 bt5/erp5_egov/bt/change_log                   |   3 +
 bt5/erp5_egov/bt/revision                     |   2 +-
 bt5/erp5_egov/bt/template_document_id_list    |   4 +-
 bt5/erp5_egov/bt/template_extension_id_list   |   8 +-
 ..._keep_last_workflow_history_only_path_list |   7 +
 bt5/erp5_egov/bt/template_test_id_list        |   2 +-
 .../document.erp5.EmailReader.py}             |   0
 .../document.erp5.EmailReader.xml             | 190 +++++++
 bt5/erp5_email_reader/bt/change_log           |   3 +
 bt5/erp5_email_reader/bt/revision             |   2 +-
 .../bt/template_document_id_list              |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.Glossary.py}               |   0
 .../extension.erp5.Glossary.xml               | 111 ++++
 .../extension.erp5.ProxyFieldUtils.py}        |   0
 .../extension.erp5.ProxyFieldUtils.xml        | 111 ++++
 ...tension.erp5.PythonScriptParserUtility.py} |   0
 ...tension.erp5.PythonScriptParserUtility.xml | 111 ++++
 bt5/erp5_forge/bt/change_log                  |   3 +
 bt5/erp5_forge/bt/revision                    |   2 +-
 bt5/erp5_forge/bt/template_extension_id_list  |   6 +-
 ..._keep_last_workflow_history_only_path_list |   3 +
 .../test.erp5.testDiscussionThread.py}        |   0
 .../test.erp5.testDiscussionThread.xml        | 111 ++++
 bt5/erp5_forum_tutorial/bt/change_log         |   3 +
 bt5/erp5_forum_tutorial/bt/revision           |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 .../test.erp5.testLiveIngestion.py}           |   0
 .../test.erp5.testLiveIngestion.xml           | 111 ++++
 bt5/erp5_ingestion/bt/change_log              |   3 +
 bt5/erp5_ingestion/bt/revision                |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 bt5/erp5_ingestion/bt/template_test_id_list   |   2 +-
 .../test.erp5.testInotifyTool.py}             |   0
 .../test.erp5.testInotifyTool.xml             | 111 ++++
 bt5/erp5_inotify/bt/revision                  |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 bt5/erp5_inotify/bt/template_test_id_list     |   2 +-
 .../test.erp5.testSOAPBinding.py}             |   0
 .../test.erp5.testSOAPBinding.xml             | 111 ++++
 bt5/erp5_interfaces/bt/revision               |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 bt5/erp5_interfaces/bt/template_test_id_list  |   2 +-
 .../extension.erp5.VObject_export.py}         |   0
 .../extension.erp5.VObject_export.xml         | 111 ++++
 bt5/erp5_mobile/bt/change_log                 |   3 +
 bt5/erp5_mobile/bt/revision                   |   2 +-
 bt5/erp5_mobile/bt/template_extension_id_list |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../test.erp5.prepareMobileFunctionalTest.py} |   0
 .../test.erp5.prepareMobileFunctionalTest.xml | 111 ++++
 bt5/erp5_mobile_ui_test/bt/change_log         |   3 +
 bt5/erp5_mobile_ui_test/bt/revision           |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 .../document.erp5.PaypalService.py}           |   0
 .../document.erp5.PaypalService.xml           | 111 ++++
 .../test.erp5.testERP5PaypalSecurePayment.py} |   0
 .../test.erp5.testERP5PaypalSecurePayment.xml | 111 ++++
 bt5/erp5_paypal_secure_payment/bt/change_log  |   3 +
 bt5/erp5_paypal_secure_payment/bt/revision    |   2 +-
 .../bt/template_document_id_list              |   2 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 .../bt/template_test_id_list                  |   2 +-
 .../document.erp5.PayzenService.py}           |   0
 .../document.erp5.PayzenService.xml           | 111 ++++
 .../test.erp5.testERP5PayzenSecurePayment.py} |   0
 .../test.erp5.testERP5PayzenSecurePayment.xml | 111 ++++
 bt5/erp5_payzen_secure_payment/bt/change_log  |   3 +
 bt5/erp5_payzen_secure_payment/bt/revision    |   2 +-
 .../bt/template_document_id_list              |   2 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 .../bt/template_test_id_list                  |   2 +-
 .../extension.erp5.ERP5PDFMerge.py}           |   0
 .../extension.erp5.ERP5PDFMerge.xml           | 111 ++++
 .../test.erp5.testERP5PDFMerge.py}            |   0
 .../test.erp5.testERP5PDFMerge.xml            | 111 ++++
 bt5/erp5_pdf_merge/bt/revision                |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 bt5/erp5_pdf_merge/bt/template_test_id_list   |   2 +-
 .../document.erp5.TileImage.py}               |   0
 .../document.erp5.TileImage.xml               | 111 ++++
 .../document.erp5.TileImageTransformed.py}    |   0
 .../document.erp5.TileImageTransformed.xml    | 111 ++++
 .../extension.erp5.ERP5SafeImage_Selenium.py} |   0
 .../extension.erp5.ERP5SafeImage_Selenium.xml | 111 ++++
 .../extension.erp5.ERP5ZoomifyImage.py}       |   0
 .../extension.erp5.ERP5ZoomifyImage.xml       | 111 ++++
 .../test.erp5.testSafeImage.py}               |   0
 .../test.erp5.testSafeImage.xml               | 111 ++++
 bt5/erp5_safeimage/bt/revision                |   2 +-
 .../bt/template_document_id_list              |   4 +-
 .../bt/template_extension_id_list             |   4 +-
 ..._keep_last_workflow_history_only_path_list |   5 +
 bt5/erp5_safeimage/bt/template_test_id_list   |   2 +-
 .../test.erp5.testERP5SocialContracts.py}     |   0
 .../test.erp5.testERP5SocialContracts.xml     | 111 ++++
 bt5/erp5_social_contracts/bt/change_log       |   3 +
 bt5/erp5_social_contracts/bt/revision         |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 .../document.erp5.SoftwareLicence.py}         |   0
 .../document.erp5.SoftwareLicence.xml         | 111 ++++
 .../document.erp5.SoftwareProduct.py}         |   0
 .../document.erp5.SoftwareProduct.xml         | 111 ++++
 bt5/erp5_software_pdm/bt/change_log           |   3 +
 bt5/erp5_software_pdm/bt/revision             |   2 +-
 .../bt/template_document_id_list              |   4 +-
 ..._keep_last_workflow_history_only_path_list |   2 +
 .../extension.erp5.OpenAMLogout.py}           |   0
 .../extension.erp5.OpenAMLogout.xml           | 111 ++++
 bt5/erp5_sso_openam/bt/change_log             |   3 +
 bt5/erp5_sso_openam/bt/revision               |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../ExtensionTemplateItem/__init__.py         |   0
 .../extension.erp5.SyncMLTool.py}             |   0
 .../extension.erp5.SyncMLTool.xml             | 111 ++++
 bt5/erp5_syncml/bt/change_log                 |   3 +
 bt5/erp5_syncml/bt/revision                   |   2 +-
 bt5/erp5_syncml/bt/template_extension_id_list |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 ...test.erp5.testSyncMLAsynchronousEngine.py} |   0
 ...test.erp5.testSyncMLAsynchronousEngine.xml | 111 ++++
 bt5/erp5_syncml_test_data/bt/change_log       |   3 +
 bt5/erp5_syncml_test_data/bt/revision         |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 .../document.erp5.TestNode.py}                |   0
 .../document.erp5.TestNode.xml                | 111 ++++
 .../document.erp5.TestSuite.py}               |   0
 .../document.erp5.TestSuite.xml               | 111 ++++
 .../extension.erp5.TestResults.py}            |   0
 .../extension.erp5.TestResults.xml            | 111 ++++
 .../test.erp5.testTaskDistribution.py}        |   0
 .../test.erp5.testTaskDistribution.xml        | 111 ++++
 bt5/erp5_test_result/bt/change_log            |   3 +
 bt5/erp5_test_result/bt/revision              |   2 +-
 .../bt/template_document_id_list              |   4 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   4 +
 bt5/erp5_test_result/bt/template_test_id_list |   2 +-
 .../document.erp5.WebServiceConnector.py}     |   0
 .../document.erp5.WebServiceConnector.xml     | 111 ++++
 .../document.erp5.WebServiceRequest.py}       |   0
 .../document.erp5.WebServiceRequest.xml       | 111 ++++
 .../document.erp5.WebServiceRequestGroup.py}  |   0
 .../document.erp5.WebServiceRequestGroup.xml  | 111 ++++
 .../ERP5DeliveredNodeConduit.py               |  70 ---
 .../ERP5InvoicedNodeConduit.py                |  75 ---
 .../ExtensionTemplateItem/__init__.py         |   0
 .../extension.erp5.TioSafeBaseConduit.py}     |   0
 .../extension.erp5.TioSafeBaseConduit.xml     | 111 ++++
 .../extension.erp5.TioSafeBrain.py}           |   0
 .../extension.erp5.TioSafeBrain.xml           | 111 ++++
 ...extension.erp5.TioSafeDoNothingConduit.py} |   0
 ...extension.erp5.TioSafeDoNothingConduit.xml | 111 ++++
 .../extension.erp5.TioSafeNodeConduit.py}     |   0
 .../extension.erp5.TioSafeNodeConduit.xml     | 111 ++++
 .../extension.erp5.TioSafeResourceConduit.py} |   0
 .../extension.erp5.TioSafeResourceConduit.xml | 111 ++++
 .../extension.erp5.TioSafeTool.py}            |   0
 .../extension.erp5.TioSafeTool.xml            | 111 ++++
 bt5/erp5_tiosafe_core/bt/change_log           |   3 +
 bt5/erp5_tiosafe_core/bt/revision             |   2 +-
 .../bt/template_document_id_list              |   6 +-
 .../bt/template_extension_id_list             |  13 +-
 ..._keep_last_workflow_history_only_path_list |   9 +
 .../salesforce/event_module/getEmailList.xml  | 494 +++++++++---------
 .../person_module/getContactAddressList.xml   | 354 ++++++-------
 bt5/erp5_tiosafe_salesforce/bt/change_log     |   3 +
 bt5/erp5_tiosafe_salesforce/bt/revision       |   2 +-
 .../ubercart/person_module/createPerson.xml   |  44 +-
 bt5/erp5_tiosafe_ubercart/bt/change_log       |   3 +
 bt5/erp5_tiosafe_ubercart/bt/revision         |   2 +-
 .../virtuemart/person_module/deletePerson.xml |  58 +-
 .../person_module/deletePersonAddress.xml     | 118 ++---
 bt5/erp5_tiosafe_virtuemart/bt/change_log     |   3 +
 bt5/erp5_tiosafe_virtuemart/bt/revision       |   2 +-
 ...ment.erp5.DuplicateInventoryConstraint.py} |   0
 ...ment.erp5.DuplicateInventoryConstraint.xml | 111 ++++
 bt5/erp5_trade/bt/change_log                  |   3 +
 bt5/erp5_trade/bt/revision                    |   2 +-
 bt5/erp5_trade/bt/template_document_id_list   |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.ERP5Zuite.py}              |   0
 .../extension.erp5.ERP5Zuite.xml              | 111 ++++
 .../extension.erp5.MailHostUtils.py}          |   0
 .../extension.erp5.MailHostUtils.xml          | 111 ++++
 .../extension.erp5.SeleniumTestUtils.py}      |   0
 .../extension.erp5.SeleniumTestUtils.xml      | 111 ++++
 bt5/erp5_ui_test_core/bt/change_log           |   3 +
 bt5/erp5_ui_test_core/bt/revision             |   2 +-
 .../bt/template_extension_id_list             |   6 +-
 ..._keep_last_workflow_history_only_path_list |   3 +
 ...tension.erp5.ERP5UpgraderCompatibility.py} |   0
 ...tension.erp5.ERP5UpgraderCompatibility.xml | 111 ++++
 .../extension.erp5.ERP5UpgraderUtils.py}      |   0
 .../extension.erp5.ERP5UpgraderUtils.xml      | 111 ++++
 .../test.erp5.testLiveUpgrader.py}            |   0
 .../test.erp5.testLiveUpgrader.xml            | 111 ++++
 bt5/erp5_upgrader/bt/change_log               |   3 +
 bt5/erp5_upgrader/bt/revision                 |   2 +-
 .../bt/template_extension_id_list             |   4 +-
 ..._keep_last_workflow_history_only_path_list |   3 +
 bt5/erp5_upgrader/bt/template_test_id_list    |   2 +-
 .../extension.erp5.ShaCache.py}               |   0
 .../extension.erp5.ShaCache.xml               | 111 ++++
 .../test.erp5.ShaCacheMixin.py}               |   0
 .../test.erp5.ShaCacheMixin.xml               | 111 ++++
 .../test.erp5.testShaCache.py}                |   0
 .../test.erp5.testShaCache.xml                | 111 ++++
 bt5/erp5_web_shacache/bt/change_log           |   3 +
 bt5/erp5_web_shacache/bt/revision             |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   3 +
 .../bt/template_test_id_list                  |   4 +-
 .../document.erp5.WebSite.py}                 |   0
 .../document.erp5.WebSite.xml                 | 111 ++++
 .../extension.erp5.ShaDir.py}                 |   0
 .../extension.erp5.ShaDir.xml                 | 111 ++++
 .../test.erp5.ShaDirMixin.py}                 |   0
 .../test.erp5.ShaDirMixin.xml                 | 111 ++++
 .../test.erp5.testShaDir.py}                  |   0
 .../test.erp5.testShaDir.xml                  | 111 ++++
 bt5/erp5_web_shadir/bt/change_log             |   3 +
 bt5/erp5_web_shadir/bt/revision               |   2 +-
 .../bt/template_document_id_list              |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   4 +
 bt5/erp5_web_shadir/bt/template_test_id_list  |   4 +-
 .../test.erp5.testUNGSecurity.py}             |   0
 .../test.erp5.testUNGSecurity.xml             | 111 ++++
 bt5/erp5_web_ung_role/bt/change_log           |   3 +
 bt5/erp5_web_ung_role/bt/revision             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 .../test.erp5.testUNG.py}                     |   0
 .../portal_components/test.erp5.testUNG.xml   | 111 ++++
 bt5/erp5_web_ung_theme/bt/change_log          |   5 +-
 bt5/erp5_web_ung_theme/bt/revision            |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 .../extension.erp5.WizardUtils.py}            |   0
 .../extension.erp5.WizardUtils.xml            | 111 ++++
 bt5/erp5_wizard/bt/change_log                 |   3 +
 bt5/erp5_wizard/bt/revision                   |   2 +-
 bt5/erp5_wizard/bt/template_extension_id_list |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.HTML5.py}                  |   0
 .../extension.erp5.HTML5.xml                  | 111 ++++
 bt5/erp5_xhtml_gadget_style/bt/change_log     |   3 +
 bt5/erp5_xhtml_gadget_style/bt/revision       |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../test.erp5.ShaSecurityMixin.py}            |   0
 .../test.erp5.ShaSecurityMixin.xml            | 111 ++++
 .../test.erp5.testShaCacheExternal.py}        |   0
 .../test.erp5.testShaCacheExternal.xml        | 111 ++++
 .../test.erp5.testShaCacheSecurity.py}        |   0
 .../test.erp5.testShaCacheSecurity.xml        | 111 ++++
 .../test.erp5.testShaDirExternal.py}          |   0
 .../test.erp5.testShaDirExternal.xml          | 111 ++++
 .../test.erp5.testShaDirSecurity.py}          |   0
 .../test.erp5.testShaDirSecurity.xml          | 111 ++++
 bt5/networkcache_erp5/bt/change_log           |   3 +
 bt5/networkcache_erp5/bt/revision             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   5 +
 .../bt/template_test_id_list                  |  10 +-
 .../test.erp5.testConflictResolution.py}      |   0
 .../test.erp5.testConflictResolution.xml      | 111 ++++
 bt5/test_conflict_resolution/bt/revision      |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../bt/template_test_id_list                  |   2 +-
 ...extension.erp5.TioLiveDecoupleInstance.py} |   0
 ...extension.erp5.TioLiveDecoupleInstance.xml | 111 ++++
 bt5/tiolive_decouple_instance/bt/change_log   |   3 +
 bt5/tiolive_decouple_instance/bt/revision     |   2 +-
 .../bt/template_extension_id_list             |   2 +-
 ..._keep_last_workflow_history_only_path_list |   1 +
 .../extension.erp5.DocumentExtraction.py}     |   0
 .../extension.erp5.DocumentExtraction.xml     | 111 ++++
 .../extension.erp5.StandardSecurity.py}       |   0
 .../extension.erp5.StandardSecurity.xml       | 111 ++++
 .../test.erp5.testActivityTool.py}            |   0
 .../test.erp5.testActivityTool.xml            | 111 ++++
 .../ERP5/bootstrap/erp5_core/bt/change_log    |   3 +
 product/ERP5/bootstrap/erp5_core/bt/revision  |   2 +-
 .../erp5_core/bt/template_extension_id_list   |   4 +-
 ..._keep_last_workflow_history_only_path_list |   3 +
 .../erp5_core/bt/template_test_id_list        |   2 +-
 471 files changed, 13514 insertions(+), 853 deletions(-)
 rename bt5/erp5_administration/ExtensionTemplateItem/{ERP5Administration.py => portal_components/extension.erp5.ERP5Administration.py} (100%)
 create mode 100644 bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Administration.xml
 rename bt5/erp5_administration/ExtensionTemplateItem/{Security.py => portal_components/extension.erp5.Security.py} (100%)
 create mode 100644 bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.Security.xml
 create mode 100644 bt5/erp5_administration/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelAssortment.py => portal_components/document.erp5.ApparelAssortment.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelAssortment.xml
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelCloth.py => portal_components/document.erp5.ApparelCloth.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelCloth.xml
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelColourRange.py => portal_components/document.erp5.ApparelColourRange.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelColourRange.xml
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelComponent.py => portal_components/document.erp5.ApparelComponent.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelComponent.xml
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelFabric.py => portal_components/document.erp5.ApparelFabric.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelFabric.xml
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelMeasurement.py => portal_components/document.erp5.ApparelMeasurement.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelMeasurement.xml
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelModel.py => portal_components/document.erp5.ApparelModel.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelModel.xml
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelShape.py => portal_components/document.erp5.ApparelShape.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelShape.xml
 rename bt5/erp5_apparel/DocumentTemplateItem/{ApparelSize.py => portal_components/document.erp5.ApparelSize.py} (100%)
 create mode 100644 bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelSize.xml
 create mode 100644 bt5/erp5_apparel/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_banking_check/ExtensionTemplateItem/{CheckbookReceptionImport.py => portal_components/extension.erp5.CheckbookReceptionImport.py} (100%)
 create mode 100644 bt5/erp5_banking_check/ExtensionTemplateItem/portal_components/extension.erp5.CheckbookReceptionImport.xml
 create mode 100644 bt5/erp5_banking_check/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_barcode/ExtensionTemplateItem/{Barcode.py => portal_components/extension.erp5.Barcode.py} (100%)
 create mode 100644 bt5/erp5_barcode/ExtensionTemplateItem/portal_components/extension.erp5.Barcode.xml
 create mode 100644 bt5/erp5_barcode/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_base/ExtensionTemplateItem/{BarcodeUtils.py => portal_components/extension.erp5.BarcodeUtils.py} (100%)
 create mode 100644 bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BarcodeUtils.xml
 rename bt5/erp5_base/ExtensionTemplateItem/{BaseMigration.py => portal_components/extension.erp5.BaseMigration.py} (100%)
 create mode 100644 bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BaseMigration.xml
 create mode 100644 bt5/erp5_base/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_bearer_token/ExtensionTemplateItem/{BearerToken.py => portal_components/extension.erp5.BearerToken.py} (100%)
 create mode 100644 bt5/erp5_bearer_token/ExtensionTemplateItem/portal_components/extension.erp5.BearerToken.xml
 rename bt5/erp5_bearer_token/TestTemplateItem/{testERP5BearerToken.py => portal_components/test.erp5.testERP5BearerToken.py} (100%)
 create mode 100644 bt5/erp5_bearer_token/TestTemplateItem/portal_components/test.erp5.testERP5BearerToken.xml
 create mode 100644 bt5/erp5_bearer_token/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_certificate_authority/DocumentTemplateItem/{Person.py => portal_components/document.erp5.Person.py} (100%)
 create mode 100644 bt5/erp5_certificate_authority/DocumentTemplateItem/portal_components/document.erp5.Person.xml
 create mode 100644 bt5/erp5_certificate_authority/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_commerce/ExtensionTemplateItem/{Ecommerce.py => portal_components/extension.erp5.Ecommerce.py} (100%)
 create mode 100644 bt5/erp5_commerce/ExtensionTemplateItem/portal_components/extension.erp5.Ecommerce.xml
 create mode 100644 bt5/erp5_commerce/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_configurator/ExtensionTemplateItem/{ConfigurationTemplate_readOOoCalcFile.py => portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile.py} (100%)
 create mode 100644 bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile.xml
 create mode 100644 bt5/erp5_configurator/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_configurator_maxma_demo/TestTemplateItem/{testMaxmaDemoConfigurationWorkflow.py => portal_components/test.erp5.testMaxmaDemoConfigurationWorkflow.py} (100%)
 create mode 100644 bt5/erp5_configurator_maxma_demo/TestTemplateItem/portal_components/test.erp5.testMaxmaDemoConfigurationWorkflow.xml
 create mode 100644 bt5/erp5_configurator_maxma_demo/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_configurator_run_my_doc/TestTemplateItem/{testRunMyDocConfigurationWorkflow.py => portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py} (100%)
 create mode 100644 bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.xml
 create mode 100644 bt5/erp5_configurator_run_my_doc/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_configurator_standard/TestTemplateItem/{testStandardConfigurationWorkflow.py => portal_components/test.erp5.testStandardConfigurationWorkflow.py} (100%)
 mode change 100755 => 100644
 create mode 100644 bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.xml
 create mode 100644 bt5/erp5_configurator_standard/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/{ConfiguratorTestUtils.py => portal_components/extension.erp5.ConfiguratorTestUtils.py} (100%)
 create mode 100644 bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/portal_components/extension.erp5.ConfiguratorTestUtils.xml
 create mode 100644 bt5/erp5_configurator_standard_ui_test/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_configurator_ung/TestTemplateItem/{testUNGConfigurationWorkflow.py => portal_components/test.erp5.testUNGConfigurationWorkflow.py} (100%)
 create mode 100644 bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml
 create mode 100644 bt5/erp5_configurator_ung/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_credential/DocumentTemplateItem/{CredentialRecovery.py => portal_components/document.erp5.CredentialRecovery.py} (100%)
 create mode 100644 bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRecovery.xml
 rename bt5/erp5_credential/DocumentTemplateItem/{CredentialRequest.py => portal_components/document.erp5.CredentialRequest.py} (100%)
 create mode 100644 bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRequest.xml
 rename bt5/erp5_credential/ExtensionTemplateItem/{Credential.py => portal_components/extension.erp5.Credential.py} (100%)
 create mode 100644 bt5/erp5_credential/ExtensionTemplateItem/portal_components/extension.erp5.Credential.xml
 create mode 100644 bt5/erp5_credential/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_crm/ExtensionTemplateItem/{CRMMigration.py => portal_components/extension.erp5.CRMMigration.py} (100%)
 create mode 100644 bt5/erp5_crm/ExtensionTemplateItem/portal_components/extension.erp5.CRMMigration.xml
 create mode 100644 bt5/erp5_crm/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_data_protection/ExtensionTemplateItem/{DataProtectionRequestUtils.py => portal_components/extension.erp5.DataProtectionRequestUtils.py} (100%)
 create mode 100644 bt5/erp5_data_protection/ExtensionTemplateItem/portal_components/extension.erp5.DataProtectionRequestUtils.xml
 create mode 100644 bt5/erp5_data_protection/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_data_set/DocumentTemplateItem/{DataSet.py => portal_components/document.erp5.DataSet.py} (100%)
 create mode 100644 bt5/erp5_data_set/DocumentTemplateItem/portal_components/document.erp5.DataSet.xml
 create mode 100644 bt5/erp5_data_set/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_development_wizard/ExtensionTemplateItem/{Development.py => portal_components/extension.erp5.Development.py} (100%)
 create mode 100644 bt5/erp5_development_wizard/ExtensionTemplateItem/portal_components/extension.erp5.Development.xml
 create mode 100644 bt5/erp5_development_wizard/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_dms/ExtensionTemplateItem/{DocumentManagement.py => portal_components/extension.erp5.DocumentManagement.py} (100%)
 create mode 100644 bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentManagement.xml
 rename bt5/erp5_dms/ExtensionTemplateItem/{DocumentSecurity.py => portal_components/extension.erp5.DocumentSecurity.py} (100%)
 create mode 100644 bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentSecurity.xml
 create mode 100644 bt5/erp5_dms/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/{DocumentConversion.py => portal_components/extension.erp5.DocumentConversion.py} (100%)
 create mode 100644 bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/portal_components/extension.erp5.DocumentConversion.xml
 create mode 100644 bt5/erp5_dms_conversion_catalog/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_dummy_movement/DocumentTemplateItem/{DummyDelivery.py => portal_components/document.erp5.DummyDelivery.py} (100%)
 create mode 100644 bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyDelivery.xml
 rename bt5/erp5_dummy_movement/DocumentTemplateItem/{DummyMovement.py => portal_components/document.erp5.DummyMovement.py} (98%)
 create mode 100644 bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.xml
 create mode 100644 bt5/erp5_dummy_movement/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_egov/DocumentTemplateItem/{EGovTypeInformation.py => portal_components/document.erp5.EGovTypeInformation.py} (100%)
 create mode 100644 bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.EGovTypeInformation.xml
 rename bt5/erp5_egov/DocumentTemplateItem/{Person.py => portal_components/document.erp5.Person.py} (100%)
 create mode 100644 bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.Person.xml
 rename bt5/erp5_egov/ExtensionTemplateItem/{Captcha.py => portal_components/extension.erp5.Captcha.py} (100%)
 create mode 100644 bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.Captcha.xml
 rename bt5/erp5_egov/ExtensionTemplateItem/{EGovSecurity.py => portal_components/extension.erp5.EGovSecurity.py} (100%)
 create mode 100644 bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.EGovSecurity.xml
 rename bt5/erp5_egov/ExtensionTemplateItem/{ERP5EGov_Extensions.py => portal_components/extension.erp5.ERP5EGov_Extensions.py} (100%)
 create mode 100644 bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.ERP5EGov_Extensions.xml
 rename bt5/erp5_egov/ExtensionTemplateItem/{SetUpEGovInstance.py => portal_components/extension.erp5.SetUpEGovInstance.py} (100%)
 create mode 100644 bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.SetUpEGovInstance.xml
 rename bt5/erp5_egov/TestTemplateItem/{TestEGovMixin.py => portal_components/test.erp5.TestEGovMixin.py} (100%)
 create mode 100644 bt5/erp5_egov/TestTemplateItem/portal_components/test.erp5.TestEGovMixin.xml
 create mode 100644 bt5/erp5_egov/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_email_reader/DocumentTemplateItem/{EmailReader.py => portal_components/document.erp5.EmailReader.py} (100%)
 create mode 100644 bt5/erp5_email_reader/DocumentTemplateItem/portal_components/document.erp5.EmailReader.xml
 create mode 100644 bt5/erp5_email_reader/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_forge/ExtensionTemplateItem/{Glossary.py => portal_components/extension.erp5.Glossary.py} (100%)
 create mode 100644 bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.Glossary.xml
 rename bt5/erp5_forge/ExtensionTemplateItem/{ProxyFieldUtils.py => portal_components/extension.erp5.ProxyFieldUtils.py} (100%)
 create mode 100644 bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.ProxyFieldUtils.xml
 rename bt5/erp5_forge/ExtensionTemplateItem/{PythonScriptParserUtility.py => portal_components/extension.erp5.PythonScriptParserUtility.py} (100%)
 create mode 100644 bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.PythonScriptParserUtility.xml
 create mode 100644 bt5/erp5_forge/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_forum_tutorial/TestTemplateItem/{testDiscussionThread.py => portal_components/test.erp5.testDiscussionThread.py} (100%)
 create mode 100644 bt5/erp5_forum_tutorial/TestTemplateItem/portal_components/test.erp5.testDiscussionThread.xml
 create mode 100644 bt5/erp5_forum_tutorial/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_ingestion/TestTemplateItem/{testLiveIngestion.py => portal_components/test.erp5.testLiveIngestion.py} (100%)
 create mode 100644 bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml
 create mode 100644 bt5/erp5_ingestion/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_inotify/TestTemplateItem/{testInotifyTool.py => portal_components/test.erp5.testInotifyTool.py} (100%)
 create mode 100644 bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml
 create mode 100644 bt5/erp5_inotify/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_interfaces/TestTemplateItem/{testSOAPBinding.py => portal_components/test.erp5.testSOAPBinding.py} (100%)
 create mode 100644 bt5/erp5_interfaces/TestTemplateItem/portal_components/test.erp5.testSOAPBinding.xml
 create mode 100644 bt5/erp5_interfaces/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_mobile/ExtensionTemplateItem/{VObject_export.py => portal_components/extension.erp5.VObject_export.py} (100%)
 create mode 100644 bt5/erp5_mobile/ExtensionTemplateItem/portal_components/extension.erp5.VObject_export.xml
 create mode 100644 bt5/erp5_mobile/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_mobile_ui_test/TestTemplateItem/{prepareMobileFunctionalTest.py => portal_components/test.erp5.prepareMobileFunctionalTest.py} (100%)
 create mode 100644 bt5/erp5_mobile_ui_test/TestTemplateItem/portal_components/test.erp5.prepareMobileFunctionalTest.xml
 create mode 100644 bt5/erp5_mobile_ui_test/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_paypal_secure_payment/DocumentTemplateItem/{PaypalService.py => portal_components/document.erp5.PaypalService.py} (100%)
 create mode 100644 bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.xml
 rename bt5/erp5_paypal_secure_payment/TestTemplateItem/{testERP5PaypalSecurePayment.py => portal_components/test.erp5.testERP5PaypalSecurePayment.py} (100%)
 create mode 100644 bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.xml
 create mode 100644 bt5/erp5_paypal_secure_payment/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_payzen_secure_payment/DocumentTemplateItem/{PayzenService.py => portal_components/document.erp5.PayzenService.py} (100%)
 create mode 100644 bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.xml
 rename bt5/erp5_payzen_secure_payment/TestTemplateItem/{testERP5PayzenSecurePayment.py => portal_components/test.erp5.testERP5PayzenSecurePayment.py} (100%)
 create mode 100644 bt5/erp5_payzen_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PayzenSecurePayment.xml
 create mode 100644 bt5/erp5_payzen_secure_payment/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_pdf_merge/ExtensionTemplateItem/{ERP5PDFMerge.py => portal_components/extension.erp5.ERP5PDFMerge.py} (100%)
 create mode 100644 bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.xml
 rename bt5/erp5_pdf_merge/TestTemplateItem/{testERP5PDFMerge.py => portal_components/test.erp5.testERP5PDFMerge.py} (100%)
 create mode 100644 bt5/erp5_pdf_merge/TestTemplateItem/portal_components/test.erp5.testERP5PDFMerge.xml
 create mode 100644 bt5/erp5_pdf_merge/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_safeimage/DocumentTemplateItem/{TileImage.py => portal_components/document.erp5.TileImage.py} (100%)
 create mode 100644 bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImage.xml
 rename bt5/erp5_safeimage/DocumentTemplateItem/{TileImageTransformed.py => portal_components/document.erp5.TileImageTransformed.py} (100%)
 create mode 100644 bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImageTransformed.xml
 rename bt5/erp5_safeimage/ExtensionTemplateItem/{ERP5SafeImage_Selenium.py => portal_components/extension.erp5.ERP5SafeImage_Selenium.py} (100%)
 create mode 100644 bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5SafeImage_Selenium.xml
 rename bt5/erp5_safeimage/ExtensionTemplateItem/{ERP5ZoomifyImage.py => portal_components/extension.erp5.ERP5ZoomifyImage.py} (100%)
 create mode 100644 bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.xml
 rename bt5/erp5_safeimage/TestTemplateItem/{testSafeImage.py => portal_components/test.erp5.testSafeImage.py} (100%)
 create mode 100644 bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.xml
 create mode 100644 bt5/erp5_safeimage/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_social_contracts/TestTemplateItem/{testERP5SocialContracts.py => portal_components/test.erp5.testERP5SocialContracts.py} (100%)
 create mode 100644 bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.xml
 create mode 100644 bt5/erp5_social_contracts/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_software_pdm/DocumentTemplateItem/{SoftwareLicence.py => portal_components/document.erp5.SoftwareLicence.py} (100%)
 create mode 100644 bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareLicence.xml
 rename bt5/erp5_software_pdm/DocumentTemplateItem/{SoftwareProduct.py => portal_components/document.erp5.SoftwareProduct.py} (100%)
 create mode 100644 bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareProduct.xml
 create mode 100644 bt5/erp5_software_pdm/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_sso_openam/ExtensionTemplateItem/{OpenAMLogout.py => portal_components/extension.erp5.OpenAMLogout.py} (100%)
 create mode 100644 bt5/erp5_sso_openam/ExtensionTemplateItem/portal_components/extension.erp5.OpenAMLogout.xml
 create mode 100644 bt5/erp5_sso_openam/bt/template_keep_last_workflow_history_only_path_list
 delete mode 100644 bt5/erp5_syncml/ExtensionTemplateItem/__init__.py
 rename bt5/erp5_syncml/ExtensionTemplateItem/{SyncMLTool.py => portal_components/extension.erp5.SyncMLTool.py} (100%)
 create mode 100644 bt5/erp5_syncml/ExtensionTemplateItem/portal_components/extension.erp5.SyncMLTool.xml
 create mode 100644 bt5/erp5_syncml/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_syncml_test_data/TestTemplateItem/{testSyncMLAsynchronousEngine.py => portal_components/test.erp5.testSyncMLAsynchronousEngine.py} (100%)
 create mode 100644 bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.xml
 create mode 100644 bt5/erp5_syncml_test_data/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_test_result/DocumentTemplateItem/{TestNode.py => portal_components/document.erp5.TestNode.py} (100%)
 create mode 100644 bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestNode.xml
 rename bt5/erp5_test_result/DocumentTemplateItem/{TestSuite.py => portal_components/document.erp5.TestSuite.py} (100%)
 create mode 100644 bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.xml
 rename bt5/erp5_test_result/ExtensionTemplateItem/{TestResults.py => portal_components/extension.erp5.TestResults.py} (100%)
 create mode 100644 bt5/erp5_test_result/ExtensionTemplateItem/portal_components/extension.erp5.TestResults.xml
 rename bt5/erp5_test_result/TestTemplateItem/{testTaskDistribution.py => portal_components/test.erp5.testTaskDistribution.py} (100%)
 create mode 100644 bt5/erp5_test_result/TestTemplateItem/portal_components/test.erp5.testTaskDistribution.xml
 create mode 100644 bt5/erp5_test_result/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_tiosafe_core/DocumentTemplateItem/{WebServiceConnector.py => portal_components/document.erp5.WebServiceConnector.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceConnector.xml
 rename bt5/erp5_tiosafe_core/DocumentTemplateItem/{WebServiceRequest.py => portal_components/document.erp5.WebServiceRequest.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequest.xml
 rename bt5/erp5_tiosafe_core/DocumentTemplateItem/{WebServiceRequestGroup.py => portal_components/document.erp5.WebServiceRequestGroup.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequestGroup.xml
 delete mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/ERP5DeliveredNodeConduit.py
 delete mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/ERP5InvoicedNodeConduit.py
 delete mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/__init__.py
 rename bt5/erp5_tiosafe_core/ExtensionTemplateItem/{TioSafeBaseConduit.py => portal_components/extension.erp5.TioSafeBaseConduit.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBaseConduit.xml
 rename bt5/erp5_tiosafe_core/ExtensionTemplateItem/{TioSafeBrain.py => portal_components/extension.erp5.TioSafeBrain.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBrain.xml
 rename bt5/erp5_tiosafe_core/ExtensionTemplateItem/{TioSafeDoNothingConduit.py => portal_components/extension.erp5.TioSafeDoNothingConduit.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeDoNothingConduit.xml
 rename bt5/erp5_tiosafe_core/ExtensionTemplateItem/{TioSafeNodeConduit.py => portal_components/extension.erp5.TioSafeNodeConduit.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeNodeConduit.xml
 rename bt5/erp5_tiosafe_core/ExtensionTemplateItem/{TioSafeResourceConduit.py => portal_components/extension.erp5.TioSafeResourceConduit.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeResourceConduit.xml
 rename bt5/erp5_tiosafe_core/ExtensionTemplateItem/{TioSafeTool.py => portal_components/extension.erp5.TioSafeTool.py} (100%)
 create mode 100644 bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeTool.xml
 create mode 100644 bt5/erp5_tiosafe_core/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_trade/DocumentTemplateItem/{DuplicateInventoryConstraint.py => portal_components/document.erp5.DuplicateInventoryConstraint.py} (100%)
 create mode 100644 bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DuplicateInventoryConstraint.xml
 create mode 100644 bt5/erp5_trade/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_ui_test_core/ExtensionTemplateItem/{ERP5Zuite.py => portal_components/extension.erp5.ERP5Zuite.py} (100%)
 create mode 100644 bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.xml
 rename bt5/erp5_ui_test_core/ExtensionTemplateItem/{MailHostUtils.py => portal_components/extension.erp5.MailHostUtils.py} (100%)
 create mode 100644 bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.MailHostUtils.xml
 rename bt5/erp5_ui_test_core/ExtensionTemplateItem/{SeleniumTestUtils.py => portal_components/extension.erp5.SeleniumTestUtils.py} (100%)
 create mode 100644 bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.SeleniumTestUtils.xml
 create mode 100644 bt5/erp5_ui_test_core/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_upgrader/ExtensionTemplateItem/{ERP5UpgraderCompatibility.py => portal_components/extension.erp5.ERP5UpgraderCompatibility.py} (100%)
 create mode 100644 bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderCompatibility.xml
 rename bt5/erp5_upgrader/ExtensionTemplateItem/{ERP5UpgraderUtils.py => portal_components/extension.erp5.ERP5UpgraderUtils.py} (100%)
 create mode 100644 bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderUtils.xml
 rename bt5/erp5_upgrader/TestTemplateItem/{testLiveUpgrader.py => portal_components/test.erp5.testLiveUpgrader.py} (100%)
 create mode 100644 bt5/erp5_upgrader/TestTemplateItem/portal_components/test.erp5.testLiveUpgrader.xml
 create mode 100644 bt5/erp5_upgrader/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_web_shacache/ExtensionTemplateItem/{ShaCache.py => portal_components/extension.erp5.ShaCache.py} (100%)
 create mode 100644 bt5/erp5_web_shacache/ExtensionTemplateItem/portal_components/extension.erp5.ShaCache.xml
 rename bt5/erp5_web_shacache/TestTemplateItem/{ShaCacheMixin.py => portal_components/test.erp5.ShaCacheMixin.py} (100%)
 create mode 100644 bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.ShaCacheMixin.xml
 rename bt5/erp5_web_shacache/TestTemplateItem/{testShaCache.py => portal_components/test.erp5.testShaCache.py} (100%)
 create mode 100644 bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.testShaCache.xml
 create mode 100644 bt5/erp5_web_shacache/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_web_shadir/DocumentTemplateItem/{WebSite.py => portal_components/document.erp5.WebSite.py} (100%)
 create mode 100644 bt5/erp5_web_shadir/DocumentTemplateItem/portal_components/document.erp5.WebSite.xml
 rename bt5/erp5_web_shadir/ExtensionTemplateItem/{ShaDir.py => portal_components/extension.erp5.ShaDir.py} (100%)
 create mode 100644 bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.xml
 rename bt5/erp5_web_shadir/TestTemplateItem/{ShaDirMixin.py => portal_components/test.erp5.ShaDirMixin.py} (100%)
 create mode 100644 bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.ShaDirMixin.xml
 rename bt5/erp5_web_shadir/TestTemplateItem/{testShaDir.py => portal_components/test.erp5.testShaDir.py} (100%)
 create mode 100644 bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.testShaDir.xml
 create mode 100644 bt5/erp5_web_shadir/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_web_ung_role/TestTemplateItem/{testUNGSecurity.py => portal_components/test.erp5.testUNGSecurity.py} (100%)
 create mode 100644 bt5/erp5_web_ung_role/TestTemplateItem/portal_components/test.erp5.testUNGSecurity.xml
 create mode 100644 bt5/erp5_web_ung_role/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_web_ung_theme/TestTemplateItem/{testUNG.py => portal_components/test.erp5.testUNG.py} (100%)
 create mode 100644 bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.xml
 create mode 100644 bt5/erp5_web_ung_theme/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_wizard/ExtensionTemplateItem/{WizardUtils.py => portal_components/extension.erp5.WizardUtils.py} (100%)
 create mode 100644 bt5/erp5_wizard/ExtensionTemplateItem/portal_components/extension.erp5.WizardUtils.xml
 create mode 100644 bt5/erp5_wizard/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/{HTML5.py => portal_components/extension.erp5.HTML5.py} (100%)
 create mode 100644 bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/portal_components/extension.erp5.HTML5.xml
 create mode 100644 bt5/erp5_xhtml_gadget_style/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/networkcache_erp5/TestTemplateItem/{ShaSecurityMixin.py => portal_components/test.erp5.ShaSecurityMixin.py} (100%)
 create mode 100644 bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.ShaSecurityMixin.xml
 rename bt5/networkcache_erp5/TestTemplateItem/{testShaCacheExternal.py => portal_components/test.erp5.testShaCacheExternal.py} (100%)
 create mode 100644 bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheExternal.xml
 rename bt5/networkcache_erp5/TestTemplateItem/{testShaCacheSecurity.py => portal_components/test.erp5.testShaCacheSecurity.py} (100%)
 create mode 100644 bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheSecurity.xml
 rename bt5/networkcache_erp5/TestTemplateItem/{testShaDirExternal.py => portal_components/test.erp5.testShaDirExternal.py} (100%)
 create mode 100644 bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirExternal.xml
 rename bt5/networkcache_erp5/TestTemplateItem/{testShaDirSecurity.py => portal_components/test.erp5.testShaDirSecurity.py} (100%)
 create mode 100644 bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirSecurity.xml
 create mode 100644 bt5/networkcache_erp5/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/test_conflict_resolution/TestTemplateItem/{testConflictResolution.py => portal_components/test.erp5.testConflictResolution.py} (100%)
 create mode 100644 bt5/test_conflict_resolution/TestTemplateItem/portal_components/test.erp5.testConflictResolution.xml
 create mode 100644 bt5/test_conflict_resolution/bt/template_keep_last_workflow_history_only_path_list
 rename bt5/tiolive_decouple_instance/ExtensionTemplateItem/{TioLiveDecoupleInstance.py => portal_components/extension.erp5.TioLiveDecoupleInstance.py} (100%)
 create mode 100644 bt5/tiolive_decouple_instance/ExtensionTemplateItem/portal_components/extension.erp5.TioLiveDecoupleInstance.xml
 create mode 100644 bt5/tiolive_decouple_instance/bt/template_keep_last_workflow_history_only_path_list
 rename product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/{DocumentExtraction.py => portal_components/extension.erp5.DocumentExtraction.py} (100%)
 create mode 100644 product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.xml
 rename product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/{StandardSecurity.py => portal_components/extension.erp5.StandardSecurity.py} (100%)
 create mode 100644 product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.StandardSecurity.xml
 rename product/ERP5/bootstrap/erp5_core/TestTemplateItem/{testActivityTool.py => portal_components/test.erp5.testActivityTool.py} (100%)
 create mode 100644 product/ERP5/bootstrap/erp5_core/TestTemplateItem/portal_components/test.erp5.testActivityTool.xml
 create mode 100644 product/ERP5/bootstrap/erp5_core/bt/template_keep_last_workflow_history_only_path_list

diff --git a/bt5/erp5_administration/ExtensionTemplateItem/ERP5Administration.py b/bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Administration.py
similarity index 100%
rename from bt5/erp5_administration/ExtensionTemplateItem/ERP5Administration.py
rename to bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Administration.py
diff --git a/bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Administration.xml b/bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Administration.xml
new file mode 100644
index 0000000000..afe5cb7b6c
--- /dev/null
+++ b/bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Administration.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ERP5Administration</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ERP5Administration</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844543.44</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_administration/ExtensionTemplateItem/Security.py b/bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.Security.py
similarity index 100%
rename from bt5/erp5_administration/ExtensionTemplateItem/Security.py
rename to bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.Security.py
diff --git a/bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.Security.xml b/bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.Security.xml
new file mode 100644
index 0000000000..c3d5188580
--- /dev/null
+++ b/bt5/erp5_administration/ExtensionTemplateItem/portal_components/extension.erp5.Security.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Security</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.Security</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844543.45</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_administration/bt/change_log b/bt5/erp5_administration/bt/change_log
index 3da0187d17..d5cf45f50e 100644
--- a/bt5/erp5_administration/bt/change_log
+++ b/bt5/erp5_administration/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-04-06 yusuke
 * Updated Base_viewSecurity to see what a user has any local roles on an object in context.
 
diff --git a/bt5/erp5_administration/bt/revision b/bt5/erp5_administration/bt/revision
index 5d1277e790..4b9bce4823 100644
--- a/bt5/erp5_administration/bt/revision
+++ b/bt5/erp5_administration/bt/revision
@@ -1 +1 @@
-147
\ No newline at end of file
+148
\ No newline at end of file
diff --git a/bt5/erp5_administration/bt/template_extension_id_list b/bt5/erp5_administration/bt/template_extension_id_list
index 8f3bf0b152..3942e56550 100644
--- a/bt5/erp5_administration/bt/template_extension_id_list
+++ b/bt5/erp5_administration/bt/template_extension_id_list
@@ -1,2 +1,2 @@
-ERP5Administration
-Security
\ No newline at end of file
+extension.erp5.ERP5Administration
+extension.erp5.Security
\ No newline at end of file
diff --git a/bt5/erp5_administration/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_administration/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..1f15a18763
--- /dev/null
+++ b/bt5/erp5_administration/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/extension.erp5.ERP5Administration
+portal_components/extension.erp5.Security
\ No newline at end of file
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelAssortment.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelAssortment.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelAssortment.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelAssortment.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelAssortment.xml
new file mode 100644
index 0000000000..366f7ca8df
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelAssortment.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelAssortment</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelAssortment</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.47</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelCloth.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelCloth.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelCloth.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelCloth.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelCloth.xml
new file mode 100644
index 0000000000..dbea137096
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelCloth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelCloth</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelCloth</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.48</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelColourRange.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelColourRange.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelColourRange.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelColourRange.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelColourRange.xml
new file mode 100644
index 0000000000..5ae02b41ff
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelColourRange.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelColourRange</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelColourRange</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.47</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelComponent.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelComponent.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelComponent.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelComponent.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelComponent.xml
new file mode 100644
index 0000000000..345683c29b
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelComponent.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelComponent</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelComponent</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.46</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelFabric.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelFabric.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelFabric.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelFabric.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelFabric.xml
new file mode 100644
index 0000000000..f879b3157f
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelFabric.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelFabric</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelFabric</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.45</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelMeasurement.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelMeasurement.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelMeasurement.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelMeasurement.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelMeasurement.xml
new file mode 100644
index 0000000000..61d27ddbd5
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelMeasurement.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelMeasurement</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelMeasurement</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.48</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelModel.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelModel.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelModel.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelModel.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelModel.xml
new file mode 100644
index 0000000000..9ce7c17afe
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelModel.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelModel</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelModel</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.46</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelShape.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelShape.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelShape.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelShape.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelShape.xml
new file mode 100644
index 0000000000..a504d6e0e7
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelShape.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelShape</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelShape</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.46</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelSize.py
similarity index 100%
rename from bt5/erp5_apparel/DocumentTemplateItem/ApparelSize.py
rename to bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelSize.py
diff --git a/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelSize.xml b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelSize.xml
new file mode 100644
index 0000000000..98a535e0e1
--- /dev/null
+++ b/bt5/erp5_apparel/DocumentTemplateItem/portal_components/document.erp5.ApparelSize.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ApparelSize</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.ApparelSize</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844579.48</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_apparel/bt/change_log b/bt5/erp5_apparel/bt/change_log
index 7123178267..53778e0636 100644
--- a/bt5/erp5_apparel/bt/change_log
+++ b/bt5/erp5_apparel/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-01-01 fabien
 * move fabric_brand category from erp5_pdm to erp5_apparel. This category is going to be replaced by a trade_mark_module.
 
diff --git a/bt5/erp5_apparel/bt/revision b/bt5/erp5_apparel/bt/revision
index c6876402f5..ac7cd1ac70 100644
--- a/bt5/erp5_apparel/bt/revision
+++ b/bt5/erp5_apparel/bt/revision
@@ -1 +1 @@
-278
\ No newline at end of file
+279
\ No newline at end of file
diff --git a/bt5/erp5_apparel/bt/template_document_id_list b/bt5/erp5_apparel/bt/template_document_id_list
index afc21fc147..b7f908ccc4 100644
--- a/bt5/erp5_apparel/bt/template_document_id_list
+++ b/bt5/erp5_apparel/bt/template_document_id_list
@@ -1,9 +1,9 @@
-ApparelCloth
-ApparelFabric
-ApparelShape
-ApparelComponent
-ApparelModel
-ApparelAssortment
-ApparelColourRange
-ApparelSize
-ApparelMeasurement
\ No newline at end of file
+document.erp5.ApparelFabric
+document.erp5.ApparelShape
+document.erp5.ApparelComponent
+document.erp5.ApparelModel
+document.erp5.ApparelAssortment
+document.erp5.ApparelColourRange
+document.erp5.ApparelSize
+document.erp5.ApparelMeasurement
+document.erp5.ApparelCloth
\ No newline at end of file
diff --git a/bt5/erp5_apparel/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_apparel/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..5e9ce0b567
--- /dev/null
+++ b/bt5/erp5_apparel/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,9 @@
+portal_components/document.erp5.ApparelFabric
+portal_components/document.erp5.ApparelShape
+portal_components/document.erp5.ApparelComponent
+portal_components/document.erp5.ApparelModel
+portal_components/document.erp5.ApparelAssortment
+portal_components/document.erp5.ApparelColourRange
+portal_components/document.erp5.ApparelSize
+portal_components/document.erp5.ApparelMeasurement
+portal_components/document.erp5.ApparelCloth
\ No newline at end of file
diff --git a/bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py b/bt5/erp5_banking_check/ExtensionTemplateItem/portal_components/extension.erp5.CheckbookReceptionImport.py
similarity index 100%
rename from bt5/erp5_banking_check/ExtensionTemplateItem/CheckbookReceptionImport.py
rename to bt5/erp5_banking_check/ExtensionTemplateItem/portal_components/extension.erp5.CheckbookReceptionImport.py
diff --git a/bt5/erp5_banking_check/ExtensionTemplateItem/portal_components/extension.erp5.CheckbookReceptionImport.xml b/bt5/erp5_banking_check/ExtensionTemplateItem/portal_components/extension.erp5.CheckbookReceptionImport.xml
new file mode 100644
index 0000000000..4a69fa9325
--- /dev/null
+++ b/bt5/erp5_banking_check/ExtensionTemplateItem/portal_components/extension.erp5.CheckbookReceptionImport.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>CheckbookReceptionImport</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.CheckbookReceptionImport</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple>
+                <string>F:  3, 0: Unable to import \'Ft.Xml\' (import-error)</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple>
+                <string>R:  5, 0: Too many local variables (37/15) (too-many-locals)</string>
+                <string>W: 26, 4: Redefining built-in \'type\' (redefined-builtin)</string>
+                <string>W: 46, 6: Use raise ErrorClass(args) instead of raise ErrorClass, args. (old-raise-syntax)</string>
+                <string>R:  5, 0: Too many branches (13/12) (too-many-branches)</string>
+                <string>R:  5, 0: Too many statements (64/50) (too-many-statements)</string>
+                <string>W: 19, 4: Unused variable \'checkbook_id\' (unused-variable)</string>
+                <string>W:  5, 0: Unused argument \'kw\' (unused-argument)</string>
+                <string>W: 26, 4: Unused variable \'type\' (unused-variable)</string>
+                <string>W: 58,10: Unused variable \'account\' (unused-variable)</string>
+                <string>W:  1, 0: Unused import LOG (unused-import)</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377848612.42</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_banking_check/bt/change_log b/bt5/erp5_banking_check/bt/change_log
index 9e79378f51..614327bc62 100644
--- a/bt5/erp5_banking_check/bt/change_log
+++ b/bt5/erp5_banking_check/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-30 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2007-11-06 aurel
 * remove checkbook movement module
 * use issue date on check operation line
diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision
index eb1f49486a..ec52cb80b9 100644
--- a/bt5/erp5_banking_check/bt/revision
+++ b/bt5/erp5_banking_check/bt/revision
@@ -1 +1 @@
-500
\ No newline at end of file
+501
\ No newline at end of file
diff --git a/bt5/erp5_banking_check/bt/template_extension_id_list b/bt5/erp5_banking_check/bt/template_extension_id_list
index 62971ed551..63b2018a76 100644
--- a/bt5/erp5_banking_check/bt/template_extension_id_list
+++ b/bt5/erp5_banking_check/bt/template_extension_id_list
@@ -1 +1 @@
-CheckbookReceptionImport
\ No newline at end of file
+extension.erp5.CheckbookReceptionImport
\ No newline at end of file
diff --git a/bt5/erp5_banking_check/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_banking_check/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..220ea4c6d0
--- /dev/null
+++ b/bt5/erp5_banking_check/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.CheckbookReceptionImport
\ No newline at end of file
diff --git a/bt5/erp5_barcode/ExtensionTemplateItem/Barcode.py b/bt5/erp5_barcode/ExtensionTemplateItem/portal_components/extension.erp5.Barcode.py
similarity index 100%
rename from bt5/erp5_barcode/ExtensionTemplateItem/Barcode.py
rename to bt5/erp5_barcode/ExtensionTemplateItem/portal_components/extension.erp5.Barcode.py
diff --git a/bt5/erp5_barcode/ExtensionTemplateItem/portal_components/extension.erp5.Barcode.xml b/bt5/erp5_barcode/ExtensionTemplateItem/portal_components/extension.erp5.Barcode.xml
new file mode 100644
index 0000000000..ebfcabe294
--- /dev/null
+++ b/bt5/erp5_barcode/ExtensionTemplateItem/portal_components/extension.erp5.Barcode.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Barcode</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.Barcode</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844655.09</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_barcode/bt/change_log b/bt5/erp5_barcode/bt/change_log
index 4edfa68853..d11c4be937 100644
--- a/bt5/erp5_barcode/bt/change_log
+++ b/bt5/erp5_barcode/bt/change_log
@@ -1 +1,4 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 First Build
\ No newline at end of file
diff --git a/bt5/erp5_barcode/bt/revision b/bt5/erp5_barcode/bt/revision
index 8fdd954df9..b393560759 100644
--- a/bt5/erp5_barcode/bt/revision
+++ b/bt5/erp5_barcode/bt/revision
@@ -1 +1 @@
-22
\ No newline at end of file
+23
\ No newline at end of file
diff --git a/bt5/erp5_barcode/bt/template_extension_id_list b/bt5/erp5_barcode/bt/template_extension_id_list
index 5cde23cab1..1694409026 100644
--- a/bt5/erp5_barcode/bt/template_extension_id_list
+++ b/bt5/erp5_barcode/bt/template_extension_id_list
@@ -1 +1 @@
-Barcode
\ No newline at end of file
+extension.erp5.Barcode
\ No newline at end of file
diff --git a/bt5/erp5_barcode/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_barcode/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..d45268061d
--- /dev/null
+++ b/bt5/erp5_barcode/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.Barcode
\ No newline at end of file
diff --git a/bt5/erp5_base/ExtensionTemplateItem/BarcodeUtils.py b/bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BarcodeUtils.py
similarity index 100%
rename from bt5/erp5_base/ExtensionTemplateItem/BarcodeUtils.py
rename to bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BarcodeUtils.py
diff --git a/bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BarcodeUtils.xml b/bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BarcodeUtils.xml
new file mode 100644
index 0000000000..5fe3ed6b90
--- /dev/null
+++ b/bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BarcodeUtils.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>BarcodeUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.BarcodeUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844401.94</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/ExtensionTemplateItem/BaseMigration.py b/bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BaseMigration.py
similarity index 100%
rename from bt5/erp5_base/ExtensionTemplateItem/BaseMigration.py
rename to bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BaseMigration.py
diff --git a/bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BaseMigration.xml b/bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BaseMigration.xml
new file mode 100644
index 0000000000..bc975b69e9
--- /dev/null
+++ b/bt5/erp5_base/ExtensionTemplateItem/portal_components/extension.erp5.BaseMigration.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>BaseMigration</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.BaseMigration</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844401.94</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log
index 5e6485b240..7cc68a63c1 100644
--- a/bt5/erp5_base/bt/change_log
+++ b/bt5/erp5_base/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2012-10-11 arnaud.fontaine
 * Fix dead ProxyField as Document_viewFieldLibrary is only available in erp5_dms which depends upon erp5_base itself.
 
@@ -428,4 +431,4 @@ and query_workflow for Cancelled and Answered states
 * Two skins were moved from portal_skins/erp5_core to portal_skins/erp5_base
 
 2006-02-24 Seb
-* Created this business template in order to split erp5_core
+* Created this business template in order to split erp5_core
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index ea934dee74..c16c9d01f8 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-1045
\ No newline at end of file
+1046
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_extension_id_list b/bt5/erp5_base/bt/template_extension_id_list
index 0644671733..cfeb110b38 100644
--- a/bt5/erp5_base/bt/template_extension_id_list
+++ b/bt5/erp5_base/bt/template_extension_id_list
@@ -1,2 +1,2 @@
-BaseMigration
-BarcodeUtils
\ No newline at end of file
+extension.erp5.BaseMigration
+extension.erp5.BarcodeUtils
\ No newline at end of file
diff --git a/bt5/erp5_base/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_base/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..adc6e3db7d
--- /dev/null
+++ b/bt5/erp5_base/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/extension.erp5.BaseMigration
+portal_components/extension.erp5.BarcodeUtils
\ No newline at end of file
diff --git a/bt5/erp5_bearer_token/ExtensionTemplateItem/BearerToken.py b/bt5/erp5_bearer_token/ExtensionTemplateItem/portal_components/extension.erp5.BearerToken.py
similarity index 100%
rename from bt5/erp5_bearer_token/ExtensionTemplateItem/BearerToken.py
rename to bt5/erp5_bearer_token/ExtensionTemplateItem/portal_components/extension.erp5.BearerToken.py
diff --git a/bt5/erp5_bearer_token/ExtensionTemplateItem/portal_components/extension.erp5.BearerToken.xml b/bt5/erp5_bearer_token/ExtensionTemplateItem/portal_components/extension.erp5.BearerToken.xml
new file mode 100644
index 0000000000..77b9c2e114
--- /dev/null
+++ b/bt5/erp5_bearer_token/ExtensionTemplateItem/portal_components/extension.erp5.BearerToken.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>BearerToken</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.BearerToken</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844710.22</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_bearer_token/TestTemplateItem/testERP5BearerToken.py b/bt5/erp5_bearer_token/TestTemplateItem/portal_components/test.erp5.testERP5BearerToken.py
similarity index 100%
rename from bt5/erp5_bearer_token/TestTemplateItem/testERP5BearerToken.py
rename to bt5/erp5_bearer_token/TestTemplateItem/portal_components/test.erp5.testERP5BearerToken.py
diff --git a/bt5/erp5_bearer_token/TestTemplateItem/portal_components/test.erp5.testERP5BearerToken.xml b/bt5/erp5_bearer_token/TestTemplateItem/portal_components/test.erp5.testERP5BearerToken.xml
new file mode 100644
index 0000000000..7b6ffad29e
--- /dev/null
+++ b/bt5/erp5_bearer_token/TestTemplateItem/portal_components/test.erp5.testERP5BearerToken.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testERP5BearerToken</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testERP5BearerToken</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844710.23</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_bearer_token/bt/change_log b/bt5/erp5_bearer_token/bt/change_log
index b0c8eec043..b2654551ad 100644
--- a/bt5/erp5_bearer_token/bt/change_log
+++ b/bt5/erp5_bearer_token/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2012/05/16 Łukasz Nowak
 * use volatile memcached to store tokens, as there is not need to touch ZODB
 * use global token key in order to decouple fully from ERP5 loggable objects
diff --git a/bt5/erp5_bearer_token/bt/revision b/bt5/erp5_bearer_token/bt/revision
index 9d607966b7..3cacc0b93c 100644
--- a/bt5/erp5_bearer_token/bt/revision
+++ b/bt5/erp5_bearer_token/bt/revision
@@ -1 +1 @@
-11
\ No newline at end of file
+12
\ No newline at end of file
diff --git a/bt5/erp5_bearer_token/bt/template_extension_id_list b/bt5/erp5_bearer_token/bt/template_extension_id_list
index fe401c5f0a..a9fa8ae7f1 100644
--- a/bt5/erp5_bearer_token/bt/template_extension_id_list
+++ b/bt5/erp5_bearer_token/bt/template_extension_id_list
@@ -1 +1 @@
-BearerToken
\ No newline at end of file
+extension.erp5.BearerToken
\ No newline at end of file
diff --git a/bt5/erp5_bearer_token/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_bearer_token/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..cbe3d4c808
--- /dev/null
+++ b/bt5/erp5_bearer_token/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/extension.erp5.BearerToken
+portal_components/test.erp5.testERP5BearerToken
\ No newline at end of file
diff --git a/bt5/erp5_bearer_token/bt/template_test_id_list b/bt5/erp5_bearer_token/bt/template_test_id_list
index e9ec688230..d6e7ac91b5 100644
--- a/bt5/erp5_bearer_token/bt/template_test_id_list
+++ b/bt5/erp5_bearer_token/bt/template_test_id_list
@@ -1 +1 @@
-testERP5BearerToken
\ No newline at end of file
+test.erp5.testERP5BearerToken
\ No newline at end of file
diff --git a/bt5/erp5_certificate_authority/DocumentTemplateItem/Person.py b/bt5/erp5_certificate_authority/DocumentTemplateItem/portal_components/document.erp5.Person.py
similarity index 100%
rename from bt5/erp5_certificate_authority/DocumentTemplateItem/Person.py
rename to bt5/erp5_certificate_authority/DocumentTemplateItem/portal_components/document.erp5.Person.py
diff --git a/bt5/erp5_certificate_authority/DocumentTemplateItem/portal_components/document.erp5.Person.xml b/bt5/erp5_certificate_authority/DocumentTemplateItem/portal_components/document.erp5.Person.xml
new file mode 100644
index 0000000000..f2fb01c96e
--- /dev/null
+++ b/bt5/erp5_certificate_authority/DocumentTemplateItem/portal_components/document.erp5.Person.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Person</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.Person</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844612.34</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_certificate_authority/bt/change_log b/bt5/erp5_certificate_authority/bt/change_log
index 607afa6289..5cf64cc876 100644
--- a/bt5/erp5_certificate_authority/bt/change_log
+++ b/bt5/erp5_certificate_authority/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-07-25 Lucas
 * Initial version.
\ No newline at end of file
diff --git a/bt5/erp5_certificate_authority/bt/revision b/bt5/erp5_certificate_authority/bt/revision
index e440e5c842..bf0d87ab1b 100644
--- a/bt5/erp5_certificate_authority/bt/revision
+++ b/bt5/erp5_certificate_authority/bt/revision
@@ -1 +1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/bt5/erp5_certificate_authority/bt/template_document_id_list b/bt5/erp5_certificate_authority/bt/template_document_id_list
index 8c10d71378..24b09db47c 100644
--- a/bt5/erp5_certificate_authority/bt/template_document_id_list
+++ b/bt5/erp5_certificate_authority/bt/template_document_id_list
@@ -1 +1 @@
-Person
\ No newline at end of file
+document.erp5.Person
\ No newline at end of file
diff --git a/bt5/erp5_certificate_authority/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_certificate_authority/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..e3950e0197
--- /dev/null
+++ b/bt5/erp5_certificate_authority/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/document.erp5.Person
\ No newline at end of file
diff --git a/bt5/erp5_commerce/ExtensionTemplateItem/Ecommerce.py b/bt5/erp5_commerce/ExtensionTemplateItem/portal_components/extension.erp5.Ecommerce.py
similarity index 100%
rename from bt5/erp5_commerce/ExtensionTemplateItem/Ecommerce.py
rename to bt5/erp5_commerce/ExtensionTemplateItem/portal_components/extension.erp5.Ecommerce.py
diff --git a/bt5/erp5_commerce/ExtensionTemplateItem/portal_components/extension.erp5.Ecommerce.xml b/bt5/erp5_commerce/ExtensionTemplateItem/portal_components/extension.erp5.Ecommerce.xml
new file mode 100644
index 0000000000..c11680e9ca
--- /dev/null
+++ b/bt5/erp5_commerce/ExtensionTemplateItem/portal_components/extension.erp5.Ecommerce.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Ecommerce</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.Ecommerce</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844574.76</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_commerce/bt/change_log b/bt5/erp5_commerce/bt/change_log
index 0e524c7322..a19f55421d 100644
--- a/bt5/erp5_commerce/bt/change_log
+++ b/bt5/erp5_commerce/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-09-30 nicolas.dumazet
 * Revert changes from 29th after adding Order abstract portal type to erp5_trade
 
diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision
index 53c731105c..27b4d6e6ba 100644
--- a/bt5/erp5_commerce/bt/revision
+++ b/bt5/erp5_commerce/bt/revision
@@ -1 +1 @@
-286
\ No newline at end of file
+287
\ No newline at end of file
diff --git a/bt5/erp5_commerce/bt/template_extension_id_list b/bt5/erp5_commerce/bt/template_extension_id_list
index ff67809d34..b33434b920 100644
--- a/bt5/erp5_commerce/bt/template_extension_id_list
+++ b/bt5/erp5_commerce/bt/template_extension_id_list
@@ -1 +1 @@
-Ecommerce
\ No newline at end of file
+extension.erp5.Ecommerce
\ No newline at end of file
diff --git a/bt5/erp5_commerce/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_commerce/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..501ba6ac9b
--- /dev/null
+++ b/bt5/erp5_commerce/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.Ecommerce
\ No newline at end of file
diff --git a/bt5/erp5_configurator/ExtensionTemplateItem/ConfigurationTemplate_readOOoCalcFile.py b/bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile.py
similarity index 100%
rename from bt5/erp5_configurator/ExtensionTemplateItem/ConfigurationTemplate_readOOoCalcFile.py
rename to bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile.py
diff --git a/bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile.xml b/bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile.xml
new file mode 100644
index 0000000000..0c66a07cdc
--- /dev/null
+++ b/bt5/erp5_configurator/ExtensionTemplateItem/portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ConfigurationTemplate_readOOoCalcFile</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ConfigurationTemplate_readOOoCalcFile</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844466.44</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator/bt/change_log b/bt5/erp5_configurator/bt/change_log
index 05cfeb82db..fb67c1cf79 100644
--- a/bt5/erp5_configurator/bt/change_log
+++ b/bt5/erp5_configurator/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-04-12 lucas
 * Replaced links for span elements.
 
diff --git a/bt5/erp5_configurator/bt/revision b/bt5/erp5_configurator/bt/revision
index b1ce634589..55a318f19d 100644
--- a/bt5/erp5_configurator/bt/revision
+++ b/bt5/erp5_configurator/bt/revision
@@ -1 +1 @@
-550
\ No newline at end of file
+551
\ No newline at end of file
diff --git a/bt5/erp5_configurator/bt/template_extension_id_list b/bt5/erp5_configurator/bt/template_extension_id_list
index 944a5c957a..ba206fcf35 100644
--- a/bt5/erp5_configurator/bt/template_extension_id_list
+++ b/bt5/erp5_configurator/bt/template_extension_id_list
@@ -1 +1 @@
-ConfigurationTemplate_readOOoCalcFile
\ No newline at end of file
+extension.erp5.ConfigurationTemplate_readOOoCalcFile
\ No newline at end of file
diff --git a/bt5/erp5_configurator/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_configurator/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..b6d6a394fc
--- /dev/null
+++ b/bt5/erp5_configurator/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.ConfigurationTemplate_readOOoCalcFile
\ No newline at end of file
diff --git a/bt5/erp5_configurator_maxma_demo/TestTemplateItem/testMaxmaDemoConfigurationWorkflow.py b/bt5/erp5_configurator_maxma_demo/TestTemplateItem/portal_components/test.erp5.testMaxmaDemoConfigurationWorkflow.py
similarity index 100%
rename from bt5/erp5_configurator_maxma_demo/TestTemplateItem/testMaxmaDemoConfigurationWorkflow.py
rename to bt5/erp5_configurator_maxma_demo/TestTemplateItem/portal_components/test.erp5.testMaxmaDemoConfigurationWorkflow.py
diff --git a/bt5/erp5_configurator_maxma_demo/TestTemplateItem/portal_components/test.erp5.testMaxmaDemoConfigurationWorkflow.xml b/bt5/erp5_configurator_maxma_demo/TestTemplateItem/portal_components/test.erp5.testMaxmaDemoConfigurationWorkflow.xml
new file mode 100644
index 0000000000..114d114bd4
--- /dev/null
+++ b/bt5/erp5_configurator_maxma_demo/TestTemplateItem/portal_components/test.erp5.testMaxmaDemoConfigurationWorkflow.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testMaxmaDemoConfigurationWorkflow</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testMaxmaDemoConfigurationWorkflow</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844688.9</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_maxma_demo/bt/change_log b/bt5/erp5_configurator_maxma_demo/bt/change_log
index 9ebd4ce82e..46ec18f504 100644
--- a/bt5/erp5_configurator_maxma_demo/bt/change_log
+++ b/bt5/erp5_configurator_maxma_demo/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-04-12 lucas
 * Added a default_image on the business configuration.
 
diff --git a/bt5/erp5_configurator_maxma_demo/bt/revision b/bt5/erp5_configurator_maxma_demo/bt/revision
index a5c750feac..368f89ceef 100644
--- a/bt5/erp5_configurator_maxma_demo/bt/revision
+++ b/bt5/erp5_configurator_maxma_demo/bt/revision
@@ -1 +1 @@
-27
\ No newline at end of file
+28
\ No newline at end of file
diff --git a/bt5/erp5_configurator_maxma_demo/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_configurator_maxma_demo/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..3d743af8ce
--- /dev/null
+++ b/bt5/erp5_configurator_maxma_demo/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testMaxmaDemoConfigurationWorkflow
\ No newline at end of file
diff --git a/bt5/erp5_configurator_maxma_demo/bt/template_test_id_list b/bt5/erp5_configurator_maxma_demo/bt/template_test_id_list
index 3dacbf0ff1..27981c2f45 100644
--- a/bt5/erp5_configurator_maxma_demo/bt/template_test_id_list
+++ b/bt5/erp5_configurator_maxma_demo/bt/template_test_id_list
@@ -1 +1 @@
-testMaxmaDemoConfigurationWorkflow
\ No newline at end of file
+test.erp5.testMaxmaDemoConfigurationWorkflow
\ No newline at end of file
diff --git a/bt5/erp5_configurator_run_my_doc/TestTemplateItem/testRunMyDocConfigurationWorkflow.py b/bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py
similarity index 100%
rename from bt5/erp5_configurator_run_my_doc/TestTemplateItem/testRunMyDocConfigurationWorkflow.py
rename to bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py
diff --git a/bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.xml b/bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.xml
new file mode 100644
index 0000000000..7db38b4bf5
--- /dev/null
+++ b/bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testRunMyDocConfigurationWorkflow</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testRunMyDocConfigurationWorkflow</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844648.03</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_run_my_doc/bt/change_log b/bt5/erp5_configurator_run_my_doc/bt/change_log
index bee2e6cd23..b6a056cf20 100644
--- a/bt5/erp5_configurator_run_my_doc/bt/change_log
+++ b/bt5/erp5_configurator_run_my_doc/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-11-14 Xavier
 * Initial commit.
\ No newline at end of file
diff --git a/bt5/erp5_configurator_run_my_doc/bt/revision b/bt5/erp5_configurator_run_my_doc/bt/revision
index f11c82a4cb..9a037142aa 100644
--- a/bt5/erp5_configurator_run_my_doc/bt/revision
+++ b/bt5/erp5_configurator_run_my_doc/bt/revision
@@ -1 +1 @@
-9
\ No newline at end of file
+10
\ No newline at end of file
diff --git a/bt5/erp5_configurator_run_my_doc/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_configurator_run_my_doc/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..d68df6e470
--- /dev/null
+++ b/bt5/erp5_configurator_run_my_doc/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testRunMyDocConfigurationWorkflow
\ No newline at end of file
diff --git a/bt5/erp5_configurator_run_my_doc/bt/template_test_id_list b/bt5/erp5_configurator_run_my_doc/bt/template_test_id_list
index efabbf40a6..cb5ca081a7 100644
--- a/bt5/erp5_configurator_run_my_doc/bt/template_test_id_list
+++ b/bt5/erp5_configurator_run_my_doc/bt/template_test_id_list
@@ -1 +1 @@
-testRunMyDocConfigurationWorkflow
\ No newline at end of file
+test.erp5.testRunMyDocConfigurationWorkflow
\ No newline at end of file
diff --git a/bt5/erp5_configurator_standard/TestTemplateItem/testStandardConfigurationWorkflow.py b/bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.py
old mode 100755
new mode 100644
similarity index 100%
rename from bt5/erp5_configurator_standard/TestTemplateItem/testStandardConfigurationWorkflow.py
rename to bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.py
diff --git a/bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.xml b/bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.xml
new file mode 100644
index 0000000000..03752c9015
--- /dev/null
+++ b/bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testStandardConfigurationWorkflow</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testStandardConfigurationWorkflow</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844508.53</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_standard/bt/change_log b/bt5/erp5_configurator_standard/bt/change_log
index 410c20251f..cf4da1acbf 100644
--- a/bt5/erp5_configurator_standard/bt/change_log
+++ b/bt5/erp5_configurator_standard/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-04-12 lucas
 * Added default image on default_standard_configuration and a better description.
 
diff --git a/bt5/erp5_configurator_standard/bt/revision b/bt5/erp5_configurator_standard/bt/revision
index b7f636c12f..ed4df3c909 100644
--- a/bt5/erp5_configurator_standard/bt/revision
+++ b/bt5/erp5_configurator_standard/bt/revision
@@ -1 +1 @@
-665
\ No newline at end of file
+666
\ No newline at end of file
diff --git a/bt5/erp5_configurator_standard/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_configurator_standard/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..2470c3075a
--- /dev/null
+++ b/bt5/erp5_configurator_standard/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testStandardConfigurationWorkflow
\ No newline at end of file
diff --git a/bt5/erp5_configurator_standard/bt/template_test_id_list b/bt5/erp5_configurator_standard/bt/template_test_id_list
index 2164810fae..8554caf298 100644
--- a/bt5/erp5_configurator_standard/bt/template_test_id_list
+++ b/bt5/erp5_configurator_standard/bt/template_test_id_list
@@ -1 +1 @@
-testStandardConfigurationWorkflow
\ No newline at end of file
+test.erp5.testStandardConfigurationWorkflow
\ No newline at end of file
diff --git a/bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/ConfiguratorTestUtils.py b/bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/portal_components/extension.erp5.ConfiguratorTestUtils.py
similarity index 100%
rename from bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/ConfiguratorTestUtils.py
rename to bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/portal_components/extension.erp5.ConfiguratorTestUtils.py
diff --git a/bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/portal_components/extension.erp5.ConfiguratorTestUtils.xml b/bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/portal_components/extension.erp5.ConfiguratorTestUtils.xml
new file mode 100644
index 0000000000..f4db10ee94
--- /dev/null
+++ b/bt5/erp5_configurator_standard_ui_test/ExtensionTemplateItem/portal_components/extension.erp5.ConfiguratorTestUtils.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ConfiguratorTestUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ConfiguratorTestUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844617.99</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_standard_ui_test/bt/change_log b/bt5/erp5_configurator_standard_ui_test/bt/change_log
index 9a9dbe4d15..b3e3961c4c 100644
--- a/bt5/erp5_configurator_standard_ui_test/bt/change_log
+++ b/bt5/erp5_configurator_standard_ui_test/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-08-16 rafael
 * Remove useless code and do not re-setup conversion server.
 
diff --git a/bt5/erp5_configurator_standard_ui_test/bt/revision b/bt5/erp5_configurator_standard_ui_test/bt/revision
index 3ea66354ca..55b7e8800f 100644
--- a/bt5/erp5_configurator_standard_ui_test/bt/revision
+++ b/bt5/erp5_configurator_standard_ui_test/bt/revision
@@ -1 +1 @@
-679
\ No newline at end of file
+680
\ No newline at end of file
diff --git a/bt5/erp5_configurator_standard_ui_test/bt/template_extension_id_list b/bt5/erp5_configurator_standard_ui_test/bt/template_extension_id_list
index a4e0f51bf9..a78b4774b7 100644
--- a/bt5/erp5_configurator_standard_ui_test/bt/template_extension_id_list
+++ b/bt5/erp5_configurator_standard_ui_test/bt/template_extension_id_list
@@ -1 +1 @@
-ConfiguratorTestUtils
\ No newline at end of file
+extension.erp5.ConfiguratorTestUtils
\ No newline at end of file
diff --git a/bt5/erp5_configurator_standard_ui_test/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_configurator_standard_ui_test/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..c4340f0cf5
--- /dev/null
+++ b/bt5/erp5_configurator_standard_ui_test/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.ConfiguratorTestUtils
\ No newline at end of file
diff --git a/bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py
similarity index 100%
rename from bt5/erp5_configurator_ung/TestTemplateItem/testUNGConfigurationWorkflow.py
rename to bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py
diff --git a/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml
new file mode 100644
index 0000000000..2955379e22
--- /dev/null
+++ b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testUNGConfigurationWorkflow</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testUNGConfigurationWorkflow</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844636.4</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_configurator_ung/bt/change_log b/bt5/erp5_configurator_ung/bt/change_log
index 6f8995bffb..fce379aaa8 100644
--- a/bt5/erp5_configurator_ung/bt/change_log
+++ b/bt5/erp5_configurator_ung/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-08-04 Gabriel L. Oliveira
 * Fix proxy of transition's scripts
 
diff --git a/bt5/erp5_configurator_ung/bt/revision b/bt5/erp5_configurator_ung/bt/revision
index fc9afb48e0..2b82dfea30 100644
--- a/bt5/erp5_configurator_ung/bt/revision
+++ b/bt5/erp5_configurator_ung/bt/revision
@@ -1 +1 @@
-59
\ No newline at end of file
+60
\ No newline at end of file
diff --git a/bt5/erp5_configurator_ung/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_configurator_ung/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..06b2dd4a59
--- /dev/null
+++ b/bt5/erp5_configurator_ung/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testUNGConfigurationWorkflow
\ No newline at end of file
diff --git a/bt5/erp5_configurator_ung/bt/template_test_id_list b/bt5/erp5_configurator_ung/bt/template_test_id_list
index d9ffc48663..f5ab78c8cf 100644
--- a/bt5/erp5_configurator_ung/bt/template_test_id_list
+++ b/bt5/erp5_configurator_ung/bt/template_test_id_list
@@ -1 +1 @@
-testUNGConfigurationWorkflow
\ No newline at end of file
+test.erp5.testUNGConfigurationWorkflow
\ No newline at end of file
diff --git a/bt5/erp5_credential/DocumentTemplateItem/CredentialRecovery.py b/bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRecovery.py
similarity index 100%
rename from bt5/erp5_credential/DocumentTemplateItem/CredentialRecovery.py
rename to bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRecovery.py
diff --git a/bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRecovery.xml b/bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRecovery.xml
new file mode 100644
index 0000000000..faa10ff9f5
--- /dev/null
+++ b/bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRecovery.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>CredentialRecovery</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.CredentialRecovery</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844547.14</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_credential/DocumentTemplateItem/CredentialRequest.py b/bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRequest.py
similarity index 100%
rename from bt5/erp5_credential/DocumentTemplateItem/CredentialRequest.py
rename to bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRequest.py
diff --git a/bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRequest.xml b/bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRequest.xml
new file mode 100644
index 0000000000..32dff7f90a
--- /dev/null
+++ b/bt5/erp5_credential/DocumentTemplateItem/portal_components/document.erp5.CredentialRequest.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>CredentialRequest</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.CredentialRequest</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844547.14</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_credential/ExtensionTemplateItem/Credential.py b/bt5/erp5_credential/ExtensionTemplateItem/portal_components/extension.erp5.Credential.py
similarity index 100%
rename from bt5/erp5_credential/ExtensionTemplateItem/Credential.py
rename to bt5/erp5_credential/ExtensionTemplateItem/portal_components/extension.erp5.Credential.py
diff --git a/bt5/erp5_credential/ExtensionTemplateItem/portal_components/extension.erp5.Credential.xml b/bt5/erp5_credential/ExtensionTemplateItem/portal_components/extension.erp5.Credential.xml
new file mode 100644
index 0000000000..fdbac98f8b
--- /dev/null
+++ b/bt5/erp5_credential/ExtensionTemplateItem/portal_components/extension.erp5.Credential.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Credential</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.Credential</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844547.15</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_credential/bt/change_log b/bt5/erp5_credential/bt/change_log
index be5b84dc39..6cf2a8711e 100644
--- a/bt5/erp5_credential/bt/change_log
+++ b/bt5/erp5_credential/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2012-07-17 Kazuhiko
 * do not use birthday property in Credential Request or Credential Update, because its storage is start_date and start_date has different meaning in these portal types.
 
diff --git a/bt5/erp5_credential/bt/revision b/bt5/erp5_credential/bt/revision
index 97964b3fde..26f5507e83 100644
--- a/bt5/erp5_credential/bt/revision
+++ b/bt5/erp5_credential/bt/revision
@@ -1 +1 @@
-422
\ No newline at end of file
+423
\ No newline at end of file
diff --git a/bt5/erp5_credential/bt/template_document_id_list b/bt5/erp5_credential/bt/template_document_id_list
index 8bd80bcb99..20d95496f3 100644
--- a/bt5/erp5_credential/bt/template_document_id_list
+++ b/bt5/erp5_credential/bt/template_document_id_list
@@ -1,2 +1,2 @@
-CredentialRequest
-CredentialRecovery
\ No newline at end of file
+document.erp5.CredentialRequest
+document.erp5.CredentialRecovery
\ No newline at end of file
diff --git a/bt5/erp5_credential/bt/template_extension_id_list b/bt5/erp5_credential/bt/template_extension_id_list
index 3e2de84961..5e732b44b2 100644
--- a/bt5/erp5_credential/bt/template_extension_id_list
+++ b/bt5/erp5_credential/bt/template_extension_id_list
@@ -1 +1 @@
-Credential
\ No newline at end of file
+extension.erp5.Credential
\ No newline at end of file
diff --git a/bt5/erp5_credential/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_credential/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..f69d365519
--- /dev/null
+++ b/bt5/erp5_credential/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,3 @@
+portal_components/document.erp5.CredentialRequest
+portal_components/document.erp5.CredentialRecovery
+portal_components/extension.erp5.Credential
\ No newline at end of file
diff --git a/bt5/erp5_crm/ExtensionTemplateItem/CRMMigration.py b/bt5/erp5_crm/ExtensionTemplateItem/portal_components/extension.erp5.CRMMigration.py
similarity index 100%
rename from bt5/erp5_crm/ExtensionTemplateItem/CRMMigration.py
rename to bt5/erp5_crm/ExtensionTemplateItem/portal_components/extension.erp5.CRMMigration.py
diff --git a/bt5/erp5_crm/ExtensionTemplateItem/portal_components/extension.erp5.CRMMigration.xml b/bt5/erp5_crm/ExtensionTemplateItem/portal_components/extension.erp5.CRMMigration.xml
new file mode 100644
index 0000000000..a0bfaa1e43
--- /dev/null
+++ b/bt5/erp5_crm/ExtensionTemplateItem/portal_components/extension.erp5.CRMMigration.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>CRMMigration</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.CRMMigration</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844447.58</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_crm/bt/change_log b/bt5/erp5_crm/bt/change_log
index 4f16bd4baf..526760e2fc 100644
--- a/bt5/erp5_crm/bt/change_log
+++ b/bt5/erp5_crm/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2013-04-25 Gabriel
 * Initial implementation of Event Path and extension of Campaign to create massive events. Event Path is a subobject of Campaign to store all information related to creation of events
 
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index 3114067d5d..b7f636c12f 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-664
\ No newline at end of file
+665
\ No newline at end of file
diff --git a/bt5/erp5_crm/bt/template_extension_id_list b/bt5/erp5_crm/bt/template_extension_id_list
index 6c376593d3..4173a3c3ac 100644
--- a/bt5/erp5_crm/bt/template_extension_id_list
+++ b/bt5/erp5_crm/bt/template_extension_id_list
@@ -1 +1 @@
-CRMMigration
\ No newline at end of file
+extension.erp5.CRMMigration
\ No newline at end of file
diff --git a/bt5/erp5_crm/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_crm/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..a6caad6ff0
--- /dev/null
+++ b/bt5/erp5_crm/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.CRMMigration
\ No newline at end of file
diff --git a/bt5/erp5_data_protection/ExtensionTemplateItem/DataProtectionRequestUtils.py b/bt5/erp5_data_protection/ExtensionTemplateItem/portal_components/extension.erp5.DataProtectionRequestUtils.py
similarity index 100%
rename from bt5/erp5_data_protection/ExtensionTemplateItem/DataProtectionRequestUtils.py
rename to bt5/erp5_data_protection/ExtensionTemplateItem/portal_components/extension.erp5.DataProtectionRequestUtils.py
diff --git a/bt5/erp5_data_protection/ExtensionTemplateItem/portal_components/extension.erp5.DataProtectionRequestUtils.xml b/bt5/erp5_data_protection/ExtensionTemplateItem/portal_components/extension.erp5.DataProtectionRequestUtils.xml
new file mode 100644
index 0000000000..b285d505d0
--- /dev/null
+++ b/bt5/erp5_data_protection/ExtensionTemplateItem/portal_components/extension.erp5.DataProtectionRequestUtils.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DataProtectionRequestUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.DataProtectionRequestUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844602.26</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_data_protection/bt/change_log b/bt5/erp5_data_protection/bt/change_log
index d6e95dc0a8..f8e0bab6a3 100644
--- a/bt5/erp5_data_protection/bt/change_log
+++ b/bt5/erp5_data_protection/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-03-26 nicolas
 * Disable fields when data protection manager can not access document containing sensitive data.
 * Display instructions to follow.
diff --git a/bt5/erp5_data_protection/bt/revision b/bt5/erp5_data_protection/bt/revision
index ac4213d6e9..d2e1cefe89 100644
--- a/bt5/erp5_data_protection/bt/revision
+++ b/bt5/erp5_data_protection/bt/revision
@@ -1 +1 @@
-43
\ No newline at end of file
+44
\ No newline at end of file
diff --git a/bt5/erp5_data_protection/bt/template_extension_id_list b/bt5/erp5_data_protection/bt/template_extension_id_list
index afb4014f45..a6f19c332f 100644
--- a/bt5/erp5_data_protection/bt/template_extension_id_list
+++ b/bt5/erp5_data_protection/bt/template_extension_id_list
@@ -1 +1 @@
-DataProtectionRequestUtils
\ No newline at end of file
+extension.erp5.DataProtectionRequestUtils
\ No newline at end of file
diff --git a/bt5/erp5_data_protection/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_data_protection/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..08e371e440
--- /dev/null
+++ b/bt5/erp5_data_protection/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.DataProtectionRequestUtils
\ No newline at end of file
diff --git a/bt5/erp5_data_set/DocumentTemplateItem/DataSet.py b/bt5/erp5_data_set/DocumentTemplateItem/portal_components/document.erp5.DataSet.py
similarity index 100%
rename from bt5/erp5_data_set/DocumentTemplateItem/DataSet.py
rename to bt5/erp5_data_set/DocumentTemplateItem/portal_components/document.erp5.DataSet.py
diff --git a/bt5/erp5_data_set/DocumentTemplateItem/portal_components/document.erp5.DataSet.xml b/bt5/erp5_data_set/DocumentTemplateItem/portal_components/document.erp5.DataSet.xml
new file mode 100644
index 0000000000..6ee2584d1c
--- /dev/null
+++ b/bt5/erp5_data_set/DocumentTemplateItem/portal_components/document.erp5.DataSet.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DataSet</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.DataSet</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844462.12</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_data_set/bt/change_log b/bt5/erp5_data_set/bt/change_log
index 511120d9b6..2610860c26 100644
--- a/bt5/erp5_data_set/bt/change_log
+++ b/bt5/erp5_data_set/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 01-06-2011 Lucas
 * Added the reference column on data set module listbox.
 * Added the reference field to be consistent with DMS.
diff --git a/bt5/erp5_data_set/bt/revision b/bt5/erp5_data_set/bt/revision
index f11c82a4cb..9a037142aa 100644
--- a/bt5/erp5_data_set/bt/revision
+++ b/bt5/erp5_data_set/bt/revision
@@ -1 +1 @@
-9
\ No newline at end of file
+10
\ No newline at end of file
diff --git a/bt5/erp5_data_set/bt/template_document_id_list b/bt5/erp5_data_set/bt/template_document_id_list
index 0e8d10a478..3fd20545cb 100644
--- a/bt5/erp5_data_set/bt/template_document_id_list
+++ b/bt5/erp5_data_set/bt/template_document_id_list
@@ -1 +1 @@
-DataSet
\ No newline at end of file
+document.erp5.DataSet
\ No newline at end of file
diff --git a/bt5/erp5_data_set/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_data_set/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..e626c45205
--- /dev/null
+++ b/bt5/erp5_data_set/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/document.erp5.DataSet
\ No newline at end of file
diff --git a/bt5/erp5_development_wizard/ExtensionTemplateItem/Development.py b/bt5/erp5_development_wizard/ExtensionTemplateItem/portal_components/extension.erp5.Development.py
similarity index 100%
rename from bt5/erp5_development_wizard/ExtensionTemplateItem/Development.py
rename to bt5/erp5_development_wizard/ExtensionTemplateItem/portal_components/extension.erp5.Development.py
diff --git a/bt5/erp5_development_wizard/ExtensionTemplateItem/portal_components/extension.erp5.Development.xml b/bt5/erp5_development_wizard/ExtensionTemplateItem/portal_components/extension.erp5.Development.xml
new file mode 100644
index 0000000000..643b6bec73
--- /dev/null
+++ b/bt5/erp5_development_wizard/ExtensionTemplateItem/portal_components/extension.erp5.Development.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Development</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.Development</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844703.29</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_development_wizard/bt/change_log b/bt5/erp5_development_wizard/bt/change_log
index e464710dd9..d503cbb2da 100644
--- a/bt5/erp5_development_wizard/bt/change_log
+++ b/bt5/erp5_development_wizard/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-03-10 Ivan
 * moved to public trunk, ready to be used
 
diff --git a/bt5/erp5_development_wizard/bt/revision b/bt5/erp5_development_wizard/bt/revision
index e77a96349c..0aeb548544 100644
--- a/bt5/erp5_development_wizard/bt/revision
+++ b/bt5/erp5_development_wizard/bt/revision
@@ -1 +1 @@
-73
\ No newline at end of file
+74
\ No newline at end of file
diff --git a/bt5/erp5_development_wizard/bt/template_extension_id_list b/bt5/erp5_development_wizard/bt/template_extension_id_list
index 76095682c2..0091ad216d 100644
--- a/bt5/erp5_development_wizard/bt/template_extension_id_list
+++ b/bt5/erp5_development_wizard/bt/template_extension_id_list
@@ -1 +1 @@
-Development
\ No newline at end of file
+extension.erp5.Development
\ No newline at end of file
diff --git a/bt5/erp5_development_wizard/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_development_wizard/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..696164e564
--- /dev/null
+++ b/bt5/erp5_development_wizard/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.Development
\ No newline at end of file
diff --git a/bt5/erp5_dms/ExtensionTemplateItem/DocumentManagement.py b/bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentManagement.py
similarity index 100%
rename from bt5/erp5_dms/ExtensionTemplateItem/DocumentManagement.py
rename to bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentManagement.py
diff --git a/bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentManagement.xml b/bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentManagement.xml
new file mode 100644
index 0000000000..09e26d8d42
--- /dev/null
+++ b/bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentManagement.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DocumentManagement</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.DocumentManagement</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844441.11</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_dms/ExtensionTemplateItem/DocumentSecurity.py b/bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentSecurity.py
similarity index 100%
rename from bt5/erp5_dms/ExtensionTemplateItem/DocumentSecurity.py
rename to bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentSecurity.py
diff --git a/bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentSecurity.xml b/bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentSecurity.xml
new file mode 100644
index 0000000000..a4bb30b4a2
--- /dev/null
+++ b/bt5/erp5_dms/ExtensionTemplateItem/portal_components/extension.erp5.DocumentSecurity.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DocumentSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.DocumentSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844441.11</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_dms/bt/change_log b/bt5/erp5_dms/bt/change_log
index e0e6f28213..feec9ffada 100644
--- a/bt5/erp5_dms/bt/change_log
+++ b/bt5/erp5_dms/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-11-11 arnaud.fontaine
 * Do not override portal_type for Catalog search when already given as a parameter of Document_getOtherVersionDocumentList.
 
diff --git a/bt5/erp5_dms/bt/revision b/bt5/erp5_dms/bt/revision
index d0cc93ed7b..2f290f28b0 100644
--- a/bt5/erp5_dms/bt/revision
+++ b/bt5/erp5_dms/bt/revision
@@ -1 +1 @@
-1274
\ No newline at end of file
+1275
\ No newline at end of file
diff --git a/bt5/erp5_dms/bt/template_extension_id_list b/bt5/erp5_dms/bt/template_extension_id_list
index b842a93add..87cc4dcd12 100644
--- a/bt5/erp5_dms/bt/template_extension_id_list
+++ b/bt5/erp5_dms/bt/template_extension_id_list
@@ -1,2 +1,2 @@
-DocumentManagement
-DocumentSecurity
\ No newline at end of file
+extension.erp5.DocumentManagement
+extension.erp5.DocumentSecurity
\ No newline at end of file
diff --git a/bt5/erp5_dms/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_dms/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..32e977ea02
--- /dev/null
+++ b/bt5/erp5_dms/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/extension.erp5.DocumentManagement
+portal_components/extension.erp5.DocumentSecurity
\ No newline at end of file
diff --git a/bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/DocumentConversion.py b/bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/portal_components/extension.erp5.DocumentConversion.py
similarity index 100%
rename from bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/DocumentConversion.py
rename to bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/portal_components/extension.erp5.DocumentConversion.py
diff --git a/bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/portal_components/extension.erp5.DocumentConversion.xml b/bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/portal_components/extension.erp5.DocumentConversion.xml
new file mode 100644
index 0000000000..4e3c225fd3
--- /dev/null
+++ b/bt5/erp5_dms_conversion_catalog/ExtensionTemplateItem/portal_components/extension.erp5.DocumentConversion.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DocumentConversion</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.DocumentConversion</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844681.7</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_dms_conversion_catalog/bt/change_log b/bt5/erp5_dms_conversion_catalog/bt/change_log
index 1eb05b26fd..e8f1680940 100644
--- a/bt5/erp5_dms_conversion_catalog/bt/change_log
+++ b/bt5/erp5_dms_conversion_catalog/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-10-19 Ivan
 * Initial import
\ No newline at end of file
diff --git a/bt5/erp5_dms_conversion_catalog/bt/revision b/bt5/erp5_dms_conversion_catalog/bt/revision
index 8fdd954df9..b393560759 100644
--- a/bt5/erp5_dms_conversion_catalog/bt/revision
+++ b/bt5/erp5_dms_conversion_catalog/bt/revision
@@ -1 +1 @@
-22
\ No newline at end of file
+23
\ No newline at end of file
diff --git a/bt5/erp5_dms_conversion_catalog/bt/template_extension_id_list b/bt5/erp5_dms_conversion_catalog/bt/template_extension_id_list
index 7b98b2218f..249dc4cab4 100644
--- a/bt5/erp5_dms_conversion_catalog/bt/template_extension_id_list
+++ b/bt5/erp5_dms_conversion_catalog/bt/template_extension_id_list
@@ -1 +1 @@
-DocumentConversion
\ No newline at end of file
+extension.erp5.DocumentConversion
\ No newline at end of file
diff --git a/bt5/erp5_dms_conversion_catalog/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_dms_conversion_catalog/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..3825dcce9f
--- /dev/null
+++ b/bt5/erp5_dms_conversion_catalog/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.DocumentConversion
\ No newline at end of file
diff --git a/bt5/erp5_dummy_movement/DocumentTemplateItem/DummyDelivery.py b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyDelivery.py
similarity index 100%
rename from bt5/erp5_dummy_movement/DocumentTemplateItem/DummyDelivery.py
rename to bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyDelivery.py
diff --git a/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyDelivery.xml b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyDelivery.xml
new file mode 100644
index 0000000000..389e3f3536
--- /dev/null
+++ b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyDelivery.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DummyDelivery</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.DummyDelivery</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844597.98</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_dummy_movement/DocumentTemplateItem/DummyMovement.py b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.py
similarity index 98%
rename from bt5/erp5_dummy_movement/DocumentTemplateItem/DummyMovement.py
rename to bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.py
index 93ceeeb1d0..2c19e75e94 100644
--- a/bt5/erp5_dummy_movement/DocumentTemplateItem/DummyMovement.py
+++ b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.py
@@ -62,7 +62,7 @@ class DummyMovement(Movement):
   # dummy deliveries, we must borrow a few methods from DummyDelivery.
 
   def getSimulationState(self):
-    from erp5.document.DummyDelivery import DummyDelivery
+    from erp5.component.document.DummyDelivery import DummyDelivery
     parent = self.getParentValue()
     if isinstance(parent, DummyDelivery):
       self = parent
diff --git a/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.xml b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.xml
new file mode 100644
index 0000000000..8b3b495682
--- /dev/null
+++ b/bt5/erp5_dummy_movement/DocumentTemplateItem/portal_components/document.erp5.DummyMovement.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DummyMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.DummyMovement</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844597.99</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_dummy_movement/bt/change_log b/bt5/erp5_dummy_movement/bt/change_log
index 9352d32a21..86a52fe7ae 100644
--- a/bt5/erp5_dummy_movement/bt/change_log
+++ b/bt5/erp5_dummy_movement/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2009-07-20 luke
 * extend with Dummy Delivery
 
diff --git a/bt5/erp5_dummy_movement/bt/revision b/bt5/erp5_dummy_movement/bt/revision
index 8fdd954df9..b393560759 100644
--- a/bt5/erp5_dummy_movement/bt/revision
+++ b/bt5/erp5_dummy_movement/bt/revision
@@ -1 +1 @@
-22
\ No newline at end of file
+23
\ No newline at end of file
diff --git a/bt5/erp5_dummy_movement/bt/template_document_id_list b/bt5/erp5_dummy_movement/bt/template_document_id_list
index b0036ed488..efe5dd0291 100644
--- a/bt5/erp5_dummy_movement/bt/template_document_id_list
+++ b/bt5/erp5_dummy_movement/bt/template_document_id_list
@@ -1,2 +1,2 @@
-DummyMovement
-DummyDelivery
\ No newline at end of file
+document.erp5.DummyDelivery
+document.erp5.DummyMovement
\ No newline at end of file
diff --git a/bt5/erp5_dummy_movement/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_dummy_movement/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..5f0e015384
--- /dev/null
+++ b/bt5/erp5_dummy_movement/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/document.erp5.DummyDelivery
+portal_components/document.erp5.DummyMovement
\ No newline at end of file
diff --git a/bt5/erp5_egov/DocumentTemplateItem/EGovTypeInformation.py b/bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.EGovTypeInformation.py
similarity index 100%
rename from bt5/erp5_egov/DocumentTemplateItem/EGovTypeInformation.py
rename to bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.EGovTypeInformation.py
diff --git a/bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.EGovTypeInformation.xml b/bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.EGovTypeInformation.xml
new file mode 100644
index 0000000000..c296402d7b
--- /dev/null
+++ b/bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.EGovTypeInformation.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>EGovTypeInformation</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.EGovTypeInformation</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377850890.67</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_egov/DocumentTemplateItem/Person.py b/bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.Person.py
similarity index 100%
rename from bt5/erp5_egov/DocumentTemplateItem/Person.py
rename to bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.Person.py
diff --git a/bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.Person.xml b/bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.Person.xml
new file mode 100644
index 0000000000..2872c54171
--- /dev/null
+++ b/bt5/erp5_egov/DocumentTemplateItem/portal_components/document.erp5.Person.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Person</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.Person</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377850890.68</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_egov/ExtensionTemplateItem/Captcha.py b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.Captcha.py
similarity index 100%
rename from bt5/erp5_egov/ExtensionTemplateItem/Captcha.py
rename to bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.Captcha.py
diff --git a/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.Captcha.xml b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.Captcha.xml
new file mode 100644
index 0000000000..3730b0b5d7
--- /dev/null
+++ b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.Captcha.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Captcha</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.Captcha</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377850890.69</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.EGovSecurity.py
similarity index 100%
rename from bt5/erp5_egov/ExtensionTemplateItem/EGovSecurity.py
rename to bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.EGovSecurity.py
diff --git a/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.EGovSecurity.xml b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.EGovSecurity.xml
new file mode 100644
index 0000000000..9b56ea24c7
--- /dev/null
+++ b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.EGovSecurity.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>EGovSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.EGovSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377850890.7</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.ERP5EGov_Extensions.py
similarity index 100%
rename from bt5/erp5_egov/ExtensionTemplateItem/ERP5EGov_Extensions.py
rename to bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.ERP5EGov_Extensions.py
diff --git a/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.ERP5EGov_Extensions.xml b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.ERP5EGov_Extensions.xml
new file mode 100644
index 0000000000..d5112920bf
--- /dev/null
+++ b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.ERP5EGov_Extensions.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ERP5EGov_Extensions</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ERP5EGov_Extensions</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377850890.69</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.SetUpEGovInstance.py
similarity index 100%
rename from bt5/erp5_egov/ExtensionTemplateItem/SetUpEGovInstance.py
rename to bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.SetUpEGovInstance.py
diff --git a/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.SetUpEGovInstance.xml b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.SetUpEGovInstance.xml
new file mode 100644
index 0000000000..59370a4cd5
--- /dev/null
+++ b/bt5/erp5_egov/ExtensionTemplateItem/portal_components/extension.erp5.SetUpEGovInstance.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>SetUpEGovInstance</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.SetUpEGovInstance</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377850890.68</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_egov/TestTemplateItem/TestEGovMixin.py b/bt5/erp5_egov/TestTemplateItem/portal_components/test.erp5.TestEGovMixin.py
similarity index 100%
rename from bt5/erp5_egov/TestTemplateItem/TestEGovMixin.py
rename to bt5/erp5_egov/TestTemplateItem/portal_components/test.erp5.TestEGovMixin.py
diff --git a/bt5/erp5_egov/TestTemplateItem/portal_components/test.erp5.TestEGovMixin.xml b/bt5/erp5_egov/TestTemplateItem/portal_components/test.erp5.TestEGovMixin.xml
new file mode 100644
index 0000000000..fe966ba562
--- /dev/null
+++ b/bt5/erp5_egov/TestTemplateItem/portal_components/test.erp5.TestEGovMixin.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TestEGovMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.TestEGovMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377850890.7</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_egov/bt/change_log b/bt5/erp5_egov/bt/change_log
index 47fbd82012..8f6db34e89 100644
--- a/bt5/erp5_egov/bt/change_log
+++ b/bt5/erp5_egov/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-30 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-12-13 nicolas.dumazet
 * Migrate Tools to portal type classes
 
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index d6ee760bad..475fbacb43 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-762
\ No newline at end of file
+763
\ No newline at end of file
diff --git a/bt5/erp5_egov/bt/template_document_id_list b/bt5/erp5_egov/bt/template_document_id_list
index 584bfe1fa6..e0c923d31c 100644
--- a/bt5/erp5_egov/bt/template_document_id_list
+++ b/bt5/erp5_egov/bt/template_document_id_list
@@ -1,2 +1,2 @@
-Person
-EGovTypeInformation
\ No newline at end of file
+document.erp5.EGovTypeInformation
+document.erp5.Person
\ No newline at end of file
diff --git a/bt5/erp5_egov/bt/template_extension_id_list b/bt5/erp5_egov/bt/template_extension_id_list
index 33af6c1bbe..e2e59ed567 100644
--- a/bt5/erp5_egov/bt/template_extension_id_list
+++ b/bt5/erp5_egov/bt/template_extension_id_list
@@ -1,4 +1,4 @@
-Captcha
-ERP5EGov_Extensions
-EGovSecurity
-SetUpEGovInstance
\ No newline at end of file
+extension.erp5.SetUpEGovInstance
+extension.erp5.Captcha
+extension.erp5.ERP5EGov_Extensions
+extension.erp5.EGovSecurity
\ No newline at end of file
diff --git a/bt5/erp5_egov/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_egov/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..f5d554fb70
--- /dev/null
+++ b/bt5/erp5_egov/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,7 @@
+portal_components/document.erp5.EGovTypeInformation
+portal_components/document.erp5.Person
+portal_components/extension.erp5.SetUpEGovInstance
+portal_components/extension.erp5.Captcha
+portal_components/extension.erp5.ERP5EGov_Extensions
+portal_components/extension.erp5.EGovSecurity
+portal_components/test.erp5.TestEGovMixin
\ No newline at end of file
diff --git a/bt5/erp5_egov/bt/template_test_id_list b/bt5/erp5_egov/bt/template_test_id_list
index ea29f506df..42d04acbda 100644
--- a/bt5/erp5_egov/bt/template_test_id_list
+++ b/bt5/erp5_egov/bt/template_test_id_list
@@ -1 +1 @@
-TestEGovMixin
\ No newline at end of file
+test.erp5.TestEGovMixin
\ No newline at end of file
diff --git a/bt5/erp5_email_reader/DocumentTemplateItem/EmailReader.py b/bt5/erp5_email_reader/DocumentTemplateItem/portal_components/document.erp5.EmailReader.py
similarity index 100%
rename from bt5/erp5_email_reader/DocumentTemplateItem/EmailReader.py
rename to bt5/erp5_email_reader/DocumentTemplateItem/portal_components/document.erp5.EmailReader.py
diff --git a/bt5/erp5_email_reader/DocumentTemplateItem/portal_components/document.erp5.EmailReader.xml b/bt5/erp5_email_reader/DocumentTemplateItem/portal_components/document.erp5.EmailReader.xml
new file mode 100644
index 0000000000..9840dc30cc
--- /dev/null
+++ b/bt5/erp5_email_reader/DocumentTemplateItem/portal_components/document.erp5.EmailReader.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>EmailReader</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.EmailReader</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple>
+                <string>E: 43, 0: No name \'ZRDB\' in module \'Shared.DC\' (no-name-in-module)</string>
+                <string>F: 43, 0: Unable to import \'Shared.DC.ZRDB.TM\' (import-error)</string>
+                <string>E:217, 2: Explicit return in __init__ (return-in-init)</string>
+                <string>E:229, 2: Explicit return in __init__ (return-in-init)</string>
+                <string>E:381, 6: Instance of \'list\' has no \'newContent\' member (but some types could not be inferred) (maybe-no-member)</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple>
+                <string>W: 73, 0: XXX - Rewrite everything to use UID! (fixme)</string>
+                <string>W: 89, 0: XXX What about port ? (fixme)</string>
+                <string>W: 91, 0: XXX response not taken into account (fixme)</string>
+                <string>W: 92, 0: XXX What about failures ? (fixme)</string>
+                <string>W: 94, 0: XXX - This leaves a small probability of failure (to be researched) (fixme)</string>
+                <string>W:137, 0: XXX response not taken into account (fixme)</string>
+                <string>W:139, 0: XXX response not taken into account (fixme)</string>
+                <string>W:141, 0: XXX (fixme)</string>
+                <string>W:146, 0: XXX (fixme)</string>
+                <string>W:157, 0: XXX - reponse not taken into account (fixme)</string>
+                <string>W:166, 0: XXX - Danger - because we are in multithreaded environment (fixme)</string>
+                <string>W:172, 0: XXX - reponse not taken into account (fixme)</string>
+                <string>W:176, 0: XXX - Here we consider that (fixme)</string>
+                <string>W:193, 0: XXX - reponse not taken into account  (fixme)</string>
+                <string>W:226, 0: XXX - Not implemented yet (fixme)</string>
+                <string>W:246, 0: XXX) (fixme)</string>
+                <string>W:248, 0: TODO: (fixme)</string>
+                <string>W:310, 0: XXX - Start with default one and only use filtered mailboxes if defined (fixme)</string>
+                <string>W:319, 0: XXX - TODO: crawl 10 folders at once (fixme)</string>
+                <string>W:335, 0: XXX (fixme)</string>
+                <string>W:342, 0: XXX-JPS (fixme)</string>
+                <string>W:345, 0: XXX maybe there is a faster way to compute this (fixme)</string>
+                <string>W:370, 0: XXX - double check whether this is consistent with  (fixme)</string>
+                <string>W:374, 0: XXX Is this a good way of processing exceptions (fixme)</string>
+                <string>W:443, 0: XXX Add read only transaction cache (fixme)</string>
+                <string>W:467, 0: XXX - Danger: if the server Url is changed, we (fixme)</string>
+                <string>W:482, 0: XXX - Here we need to add a switch (POP vs. IMAP vs. IMAPS etc.) (fixme)</string>
+                <string>W:143, 0: Found indentation with tabs instead of spaces (mixed-indentation)</string>
+                <string>W:144, 0: Found indentation with tabs instead of spaces (mixed-indentation)</string>
+                <string>W:146, 0: Found indentation with tabs instead of spaces (mixed-indentation)</string>
+                <string>R: 67, 0: Too many instance attributes (8/7) (too-many-instance-attributes)</string>
+                <string>W: 79, 2: __init__ method from base class \'MailServer\' is not called (super-init-not-called)</string>
+                <string>W: 93, 4: Access to a protected member _register of a client class (protected-access)</string>
+                <string>W: 91,14: Unused variable \'message_count\' (unused-variable)</string>
+                <string>W: 91, 4: Unused variable \'response\' (unused-variable)</string>
+                <string>W: 97, 0: Unused argument \'ignored\' (unused-argument)</string>
+                <string>W:113, 0: Unused argument \'ignored\' (unused-argument)</string>
+                <string>W:157, 4: Unused variable \'response\' (unused-variable)</string>
+                <string>W:179, 8: Unused variable \'folder_type\' (unused-variable)</string>
+                <string>W:172, 4: Unused variable \'response\' (unused-variable)</string>
+                <string>W:143, 1: Attribute \'message_count\' defined outside __init__ (attribute-defined-outside-init)</string>
+                <string>W:220, 0: Method \'getMessageFolderList\' is abstract in class \'MailServer\' but is not overridden (abstract-method)</string>
+                <string>W:220, 0: Method \'getMessageUIDList\' is abstract in class \'MailServer\' but is not overridden (abstract-method)</string>
+                <string>W:220, 0: Method \'__init__\' is abstract in class \'MailServer\' but is not overridden (abstract-method)</string>
+                <string>W:220, 0: Method \'getMessageData\' is abstract in class \'MailServer\' but is not overridden (abstract-method)</string>
+                <string>W:228, 0: Method \'getMessageFolderList\' is abstract in class \'MailServer\' but is not overridden (abstract-method)</string>
+                <string>W:228, 0: Method \'getMessageUIDList\' is abstract in class \'MailServer\' but is not overridden (abstract-method)</string>
+                <string>W:228, 0: Method \'getMessageData\' is abstract in class \'MailServer\' but is not overridden (abstract-method)</string>
+                <string>R:233, 0: Too many ancestors (45/7) (too-many-ancestors)</string>
+                <string>W:298,20: Used builtin function \'filter\' (bad-builtin)</string>
+                <string>W:298,20: map/filter on lambda could be replaced by comprehension (deprecated-lambda)</string>
+                <string>W:339,23: Used builtin function \'filter\' (bad-builtin)</string>
+                <string>W:339,23: map/filter on lambda could be replaced by comprehension (deprecated-lambda)</string>
+                <string>W:348,23: Used builtin function \'filter\' (bad-builtin)</string>
+                <string>W:348,23: map/filter on lambda could be replaced by comprehension (deprecated-lambda)</string>
+                <string>W:335,23: Unused variable \'error_message\' (unused-variable)</string>
+                <string>R:430, 2: Method could be a function (no-self-use)</string>
+                <string>R:233, 0: Too many public methods (398/20) (too-many-public-methods)</string>
+                <string>W:427, 4: Attribute \'_latest_uid\' defined outside __init__ (attribute-defined-outside-init)</string>
+                <string>W: 34, 0: Unused import XMLObject (unused-import)</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377850660.74</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_email_reader/bt/change_log b/bt5/erp5_email_reader/bt/change_log
index b42b5d704e..a185012b4f 100644
--- a/bt5/erp5_email_reader/bt/change_log
+++ b/bt5/erp5_email_reader/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-30 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-02-07 gabriel
 * Added erp5_crm as dependency
 * Update Fields
diff --git a/bt5/erp5_email_reader/bt/revision b/bt5/erp5_email_reader/bt/revision
index 8580e7b684..b74e882ae3 100644
--- a/bt5/erp5_email_reader/bt/revision
+++ b/bt5/erp5_email_reader/bt/revision
@@ -1 +1 @@
-30
\ No newline at end of file
+31
\ No newline at end of file
diff --git a/bt5/erp5_email_reader/bt/template_document_id_list b/bt5/erp5_email_reader/bt/template_document_id_list
index a24f55a668..48bde89439 100644
--- a/bt5/erp5_email_reader/bt/template_document_id_list
+++ b/bt5/erp5_email_reader/bt/template_document_id_list
@@ -1 +1 @@
-EmailReader
\ No newline at end of file
+document.erp5.EmailReader
\ No newline at end of file
diff --git a/bt5/erp5_email_reader/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_email_reader/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..65ac6cffb6
--- /dev/null
+++ b/bt5/erp5_email_reader/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/document.erp5.EmailReader
\ No newline at end of file
diff --git a/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.Glossary.py
similarity index 100%
rename from bt5/erp5_forge/ExtensionTemplateItem/Glossary.py
rename to bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.Glossary.py
diff --git a/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.Glossary.xml b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.Glossary.xml
new file mode 100644
index 0000000000..ca118b6cd1
--- /dev/null
+++ b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.Glossary.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>Glossary</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.Glossary</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844714.94</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_forge/ExtensionTemplateItem/ProxyFieldUtils.py b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.ProxyFieldUtils.py
similarity index 100%
rename from bt5/erp5_forge/ExtensionTemplateItem/ProxyFieldUtils.py
rename to bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.ProxyFieldUtils.py
diff --git a/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.ProxyFieldUtils.xml b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.ProxyFieldUtils.xml
new file mode 100644
index 0000000000..ad5c29cf0e
--- /dev/null
+++ b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.ProxyFieldUtils.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ProxyFieldUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ProxyFieldUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844714.94</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_forge/ExtensionTemplateItem/PythonScriptParserUtility.py b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.PythonScriptParserUtility.py
similarity index 100%
rename from bt5/erp5_forge/ExtensionTemplateItem/PythonScriptParserUtility.py
rename to bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.PythonScriptParserUtility.py
diff --git a/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.PythonScriptParserUtility.xml b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.PythonScriptParserUtility.xml
new file mode 100644
index 0000000000..b9b9525bf2
--- /dev/null
+++ b/bt5/erp5_forge/ExtensionTemplateItem/portal_components/extension.erp5.PythonScriptParserUtility.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>PythonScriptParserUtility</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.PythonScriptParserUtility</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844714.94</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_forge/bt/change_log b/bt5/erp5_forge/bt/change_log
index bfd84c1dc6..d02d334f09 100644
--- a/bt5/erp5_forge/bt/change_log
+++ b/bt5/erp5_forge/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2012-10-04 arnaud.fontaine
 * getPreferredSubversionWorkingCopyList() cannot be set properly.
 
diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision
index acec591c56..8e6ba7fb6c 100644
--- a/bt5/erp5_forge/bt/revision
+++ b/bt5/erp5_forge/bt/revision
@@ -1 +1 @@
-674
\ No newline at end of file
+675
\ No newline at end of file
diff --git a/bt5/erp5_forge/bt/template_extension_id_list b/bt5/erp5_forge/bt/template_extension_id_list
index 815ca1b8db..e0cf333ab5 100644
--- a/bt5/erp5_forge/bt/template_extension_id_list
+++ b/bt5/erp5_forge/bt/template_extension_id_list
@@ -1,3 +1,3 @@
-Glossary
-PythonScriptParserUtility
-ProxyFieldUtils
\ No newline at end of file
+extension.erp5.Glossary
+extension.erp5.ProxyFieldUtils
+extension.erp5.PythonScriptParserUtility
\ No newline at end of file
diff --git a/bt5/erp5_forge/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_forge/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..e1857b4690
--- /dev/null
+++ b/bt5/erp5_forge/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,3 @@
+portal_components/extension.erp5.Glossary
+portal_components/extension.erp5.ProxyFieldUtils
+portal_components/extension.erp5.PythonScriptParserUtility
\ No newline at end of file
diff --git a/bt5/erp5_forum_tutorial/TestTemplateItem/testDiscussionThread.py b/bt5/erp5_forum_tutorial/TestTemplateItem/portal_components/test.erp5.testDiscussionThread.py
similarity index 100%
rename from bt5/erp5_forum_tutorial/TestTemplateItem/testDiscussionThread.py
rename to bt5/erp5_forum_tutorial/TestTemplateItem/portal_components/test.erp5.testDiscussionThread.py
diff --git a/bt5/erp5_forum_tutorial/TestTemplateItem/portal_components/test.erp5.testDiscussionThread.xml b/bt5/erp5_forum_tutorial/TestTemplateItem/portal_components/test.erp5.testDiscussionThread.xml
new file mode 100644
index 0000000000..c2c5e6113d
--- /dev/null
+++ b/bt5/erp5_forum_tutorial/TestTemplateItem/portal_components/test.erp5.testDiscussionThread.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testDiscussionThread</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testDiscussionThread</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844658.71</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_forum_tutorial/bt/change_log b/bt5/erp5_forum_tutorial/bt/change_log
index fdfe4bacaa..224a011828 100644
--- a/bt5/erp5_forum_tutorial/bt/change_log
+++ b/bt5/erp5_forum_tutorial/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-02-23 Minashe
 * Initial release.
\ No newline at end of file
diff --git a/bt5/erp5_forum_tutorial/bt/revision b/bt5/erp5_forum_tutorial/bt/revision
index 7813681f5b..62f9457511 100644
--- a/bt5/erp5_forum_tutorial/bt/revision
+++ b/bt5/erp5_forum_tutorial/bt/revision
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/bt5/erp5_forum_tutorial/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_forum_tutorial/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..21495b90fd
--- /dev/null
+++ b/bt5/erp5_forum_tutorial/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testDiscussionThread
\ No newline at end of file
diff --git a/bt5/erp5_forum_tutorial/bt/template_test_id_list b/bt5/erp5_forum_tutorial/bt/template_test_id_list
index c1a2711d94..8cf28ef85c 100644
--- a/bt5/erp5_forum_tutorial/bt/template_test_id_list
+++ b/bt5/erp5_forum_tutorial/bt/template_test_id_list
@@ -1 +1 @@
-testDiscussionThread
\ No newline at end of file
+test.erp5.testDiscussionThread
\ No newline at end of file
diff --git a/bt5/erp5_ingestion/TestTemplateItem/testLiveIngestion.py b/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py
similarity index 100%
rename from bt5/erp5_ingestion/TestTemplateItem/testLiveIngestion.py
rename to bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py
diff --git a/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml b/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml
new file mode 100644
index 0000000000..0962b85686
--- /dev/null
+++ b/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testLiveIngestion</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testLiveIngestion</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844413.13</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_ingestion/bt/change_log b/bt5/erp5_ingestion/bt/change_log
index 9f0fd5a173..1a170357ad 100644
--- a/bt5/erp5_ingestion/bt/change_log
+++ b/bt5/erp5_ingestion/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-12-13 nicolas.dumazet
 * Migrate Tools to portal type classes
 
diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision
index bc768da71a..5d1277e790 100644
--- a/bt5/erp5_ingestion/bt/revision
+++ b/bt5/erp5_ingestion/bt/revision
@@ -1 +1 @@
-146
\ No newline at end of file
+147
\ No newline at end of file
diff --git a/bt5/erp5_ingestion/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_ingestion/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..ae7ac54722
--- /dev/null
+++ b/bt5/erp5_ingestion/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testLiveIngestion
\ No newline at end of file
diff --git a/bt5/erp5_ingestion/bt/template_test_id_list b/bt5/erp5_ingestion/bt/template_test_id_list
index d41ad491cb..b2d6764ce7 100644
--- a/bt5/erp5_ingestion/bt/template_test_id_list
+++ b/bt5/erp5_ingestion/bt/template_test_id_list
@@ -1 +1 @@
-testLiveIngestion
\ No newline at end of file
+test.erp5.testLiveIngestion
\ No newline at end of file
diff --git a/bt5/erp5_inotify/TestTemplateItem/testInotifyTool.py b/bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.py
similarity index 100%
rename from bt5/erp5_inotify/TestTemplateItem/testInotifyTool.py
rename to bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.py
diff --git a/bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml b/bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml
new file mode 100644
index 0000000000..930e9948de
--- /dev/null
+++ b/bt5/erp5_inotify/TestTemplateItem/portal_components/test.erp5.testInotifyTool.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testInotifyTool</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testInotifyTool</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844632.42</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_inotify/bt/revision b/bt5/erp5_inotify/bt/revision
index bf0d87ab1b..7813681f5b 100644
--- a/bt5/erp5_inotify/bt/revision
+++ b/bt5/erp5_inotify/bt/revision
@@ -1 +1 @@
-4
\ No newline at end of file
+5
\ No newline at end of file
diff --git a/bt5/erp5_inotify/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_inotify/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..99f642d443
--- /dev/null
+++ b/bt5/erp5_inotify/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testInotifyTool
\ No newline at end of file
diff --git a/bt5/erp5_inotify/bt/template_test_id_list b/bt5/erp5_inotify/bt/template_test_id_list
index 3b5b4fc3ca..f79d719493 100644
--- a/bt5/erp5_inotify/bt/template_test_id_list
+++ b/bt5/erp5_inotify/bt/template_test_id_list
@@ -1 +1 @@
-testInotifyTool
\ No newline at end of file
+test.erp5.testInotifyTool
\ No newline at end of file
diff --git a/bt5/erp5_interfaces/TestTemplateItem/testSOAPBinding.py b/bt5/erp5_interfaces/TestTemplateItem/portal_components/test.erp5.testSOAPBinding.py
similarity index 100%
rename from bt5/erp5_interfaces/TestTemplateItem/testSOAPBinding.py
rename to bt5/erp5_interfaces/TestTemplateItem/portal_components/test.erp5.testSOAPBinding.py
diff --git a/bt5/erp5_interfaces/TestTemplateItem/portal_components/test.erp5.testSOAPBinding.xml b/bt5/erp5_interfaces/TestTemplateItem/portal_components/test.erp5.testSOAPBinding.xml
new file mode 100644
index 0000000000..4f6c3745e9
--- /dev/null
+++ b/bt5/erp5_interfaces/TestTemplateItem/portal_components/test.erp5.testSOAPBinding.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testSOAPBinding</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testSOAPBinding</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844705.97</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_interfaces/bt/revision b/bt5/erp5_interfaces/bt/revision
index e440e5c842..bf0d87ab1b 100644
--- a/bt5/erp5_interfaces/bt/revision
+++ b/bt5/erp5_interfaces/bt/revision
@@ -1 +1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/bt5/erp5_interfaces/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_interfaces/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..7372547e8b
--- /dev/null
+++ b/bt5/erp5_interfaces/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testSOAPBinding
\ No newline at end of file
diff --git a/bt5/erp5_interfaces/bt/template_test_id_list b/bt5/erp5_interfaces/bt/template_test_id_list
index 4c6d0d68a1..4d0cf36d88 100644
--- a/bt5/erp5_interfaces/bt/template_test_id_list
+++ b/bt5/erp5_interfaces/bt/template_test_id_list
@@ -1 +1 @@
-testSOAPBinding
\ No newline at end of file
+test.erp5.testSOAPBinding
\ No newline at end of file
diff --git a/bt5/erp5_mobile/ExtensionTemplateItem/VObject_export.py b/bt5/erp5_mobile/ExtensionTemplateItem/portal_components/extension.erp5.VObject_export.py
similarity index 100%
rename from bt5/erp5_mobile/ExtensionTemplateItem/VObject_export.py
rename to bt5/erp5_mobile/ExtensionTemplateItem/portal_components/extension.erp5.VObject_export.py
diff --git a/bt5/erp5_mobile/ExtensionTemplateItem/portal_components/extension.erp5.VObject_export.xml b/bt5/erp5_mobile/ExtensionTemplateItem/portal_components/extension.erp5.VObject_export.xml
new file mode 100644
index 0000000000..8cfbb9dd35
--- /dev/null
+++ b/bt5/erp5_mobile/ExtensionTemplateItem/portal_components/extension.erp5.VObject_export.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>VObject_export</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.VObject_export</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844699.51</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_mobile/bt/change_log b/bt5/erp5_mobile/bt/change_log
index fd5c3009d5..8864c9d7fd 100644
--- a/bt5/erp5_mobile/bt/change_log
+++ b/bt5/erp5_mobile/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2009-08-19 Mohamadou
 * Disallow Export as vCard in  other modules
 * Add check/uncheck checkbox in list view
diff --git a/bt5/erp5_mobile/bt/revision b/bt5/erp5_mobile/bt/revision
index 3d9aebb2cc..8c0474e323 100644
--- a/bt5/erp5_mobile/bt/revision
+++ b/bt5/erp5_mobile/bt/revision
@@ -1 +1 @@
-68
\ No newline at end of file
+69
\ No newline at end of file
diff --git a/bt5/erp5_mobile/bt/template_extension_id_list b/bt5/erp5_mobile/bt/template_extension_id_list
index bb129ea596..92afe9b841 100644
--- a/bt5/erp5_mobile/bt/template_extension_id_list
+++ b/bt5/erp5_mobile/bt/template_extension_id_list
@@ -1 +1 @@
-VObject_export
\ No newline at end of file
+extension.erp5.VObject_export
\ No newline at end of file
diff --git a/bt5/erp5_mobile/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_mobile/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..7521984c2e
--- /dev/null
+++ b/bt5/erp5_mobile/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.VObject_export
\ No newline at end of file
diff --git a/bt5/erp5_mobile_ui_test/TestTemplateItem/prepareMobileFunctionalTest.py b/bt5/erp5_mobile_ui_test/TestTemplateItem/portal_components/test.erp5.prepareMobileFunctionalTest.py
similarity index 100%
rename from bt5/erp5_mobile_ui_test/TestTemplateItem/prepareMobileFunctionalTest.py
rename to bt5/erp5_mobile_ui_test/TestTemplateItem/portal_components/test.erp5.prepareMobileFunctionalTest.py
diff --git a/bt5/erp5_mobile_ui_test/TestTemplateItem/portal_components/test.erp5.prepareMobileFunctionalTest.xml b/bt5/erp5_mobile_ui_test/TestTemplateItem/portal_components/test.erp5.prepareMobileFunctionalTest.xml
new file mode 100644
index 0000000000..c9d17c59e4
--- /dev/null
+++ b/bt5/erp5_mobile_ui_test/TestTemplateItem/portal_components/test.erp5.prepareMobileFunctionalTest.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>prepareMobileFunctionalTest</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.prepareMobileFunctionalTest</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844653.05</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_mobile_ui_test/bt/change_log b/bt5/erp5_mobile_ui_test/bt/change_log
index 0ba643de25..a855c56cc8 100644
--- a/bt5/erp5_mobile_ui_test/bt/change_log
+++ b/bt5/erp5_mobile_ui_test/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2009-08-25 Mohamadou
 * Refactor erp_ui_test to reduce "If mobile" statments.
 
diff --git a/bt5/erp5_mobile_ui_test/bt/revision b/bt5/erp5_mobile_ui_test/bt/revision
index 9a037142aa..9d607966b7 100644
--- a/bt5/erp5_mobile_ui_test/bt/revision
+++ b/bt5/erp5_mobile_ui_test/bt/revision
@@ -1 +1 @@
-10
\ No newline at end of file
+11
\ No newline at end of file
diff --git a/bt5/erp5_mobile_ui_test/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_mobile_ui_test/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..47b72615c6
--- /dev/null
+++ b/bt5/erp5_mobile_ui_test/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.prepareMobileFunctionalTest
\ No newline at end of file
diff --git a/bt5/erp5_mobile_ui_test/bt/template_test_id_list b/bt5/erp5_mobile_ui_test/bt/template_test_id_list
index ea602811f6..d5f970289b 100644
--- a/bt5/erp5_mobile_ui_test/bt/template_test_id_list
+++ b/bt5/erp5_mobile_ui_test/bt/template_test_id_list
@@ -1 +1 @@
-prepareMobileFunctionalTest
\ No newline at end of file
+test.erp5.prepareMobileFunctionalTest
\ No newline at end of file
diff --git a/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/PaypalService.py b/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.py
similarity index 100%
rename from bt5/erp5_paypal_secure_payment/DocumentTemplateItem/PaypalService.py
rename to bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.py
diff --git a/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.xml b/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.xml
new file mode 100644
index 0000000000..cef8006ff8
--- /dev/null
+++ b/bt5/erp5_paypal_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PaypalService.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>PaypalService</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.PaypalService</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844561.74</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_paypal_secure_payment/TestTemplateItem/testERP5PaypalSecurePayment.py b/bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.py
similarity index 100%
rename from bt5/erp5_paypal_secure_payment/TestTemplateItem/testERP5PaypalSecurePayment.py
rename to bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.py
diff --git a/bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.xml b/bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.xml
new file mode 100644
index 0000000000..afc2e5737a
--- /dev/null
+++ b/bt5/erp5_paypal_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PaypalSecurePayment.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testERP5PaypalSecurePayment</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testERP5PaypalSecurePayment</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844561.74</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_paypal_secure_payment/bt/change_log b/bt5/erp5_paypal_secure_payment/bt/change_log
index 29861bbea3..5ff3ff1b46 100644
--- a/bt5/erp5_paypal_secure_payment/bt/change_log
+++ b/bt5/erp5_paypal_secure_payment/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2013-06-18 arnaud.fontaine
 * message_attribute_does_not_match was incorrectly renamed to message_attribute_match when migrating StringAttributeMatch constraint from filesystem to ZODB. Also, use message_attribute_not_match instead of message_attribute_does_not_match to follow ERP5 naming convention.
 
diff --git a/bt5/erp5_paypal_secure_payment/bt/revision b/bt5/erp5_paypal_secure_payment/bt/revision
index c7930257df..301160a930 100644
--- a/bt5/erp5_paypal_secure_payment/bt/revision
+++ b/bt5/erp5_paypal_secure_payment/bt/revision
@@ -1 +1 @@
-7
\ No newline at end of file
+8
\ No newline at end of file
diff --git a/bt5/erp5_paypal_secure_payment/bt/template_document_id_list b/bt5/erp5_paypal_secure_payment/bt/template_document_id_list
index 157fae4879..9c56db5a9d 100644
--- a/bt5/erp5_paypal_secure_payment/bt/template_document_id_list
+++ b/bt5/erp5_paypal_secure_payment/bt/template_document_id_list
@@ -1 +1 @@
-PaypalService
\ No newline at end of file
+document.erp5.PaypalService
\ No newline at end of file
diff --git a/bt5/erp5_paypal_secure_payment/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_paypal_secure_payment/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..97fd638e3d
--- /dev/null
+++ b/bt5/erp5_paypal_secure_payment/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/document.erp5.PaypalService
+portal_components/test.erp5.testERP5PaypalSecurePayment
\ No newline at end of file
diff --git a/bt5/erp5_paypal_secure_payment/bt/template_test_id_list b/bt5/erp5_paypal_secure_payment/bt/template_test_id_list
index 8cd365f91b..2632c00f1c 100644
--- a/bt5/erp5_paypal_secure_payment/bt/template_test_id_list
+++ b/bt5/erp5_paypal_secure_payment/bt/template_test_id_list
@@ -1 +1 @@
-testERP5PaypalSecurePayment
\ No newline at end of file
+test.erp5.testERP5PaypalSecurePayment
\ No newline at end of file
diff --git a/bt5/erp5_payzen_secure_payment/DocumentTemplateItem/PayzenService.py b/bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.py
similarity index 100%
rename from bt5/erp5_payzen_secure_payment/DocumentTemplateItem/PayzenService.py
rename to bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.py
diff --git a/bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.xml b/bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.xml
new file mode 100644
index 0000000000..91758d55ab
--- /dev/null
+++ b/bt5/erp5_payzen_secure_payment/DocumentTemplateItem/portal_components/document.erp5.PayzenService.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>PayzenService</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.PayzenService</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844605.75</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_payzen_secure_payment/TestTemplateItem/testERP5PayzenSecurePayment.py b/bt5/erp5_payzen_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PayzenSecurePayment.py
similarity index 100%
rename from bt5/erp5_payzen_secure_payment/TestTemplateItem/testERP5PayzenSecurePayment.py
rename to bt5/erp5_payzen_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PayzenSecurePayment.py
diff --git a/bt5/erp5_payzen_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PayzenSecurePayment.xml b/bt5/erp5_payzen_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PayzenSecurePayment.xml
new file mode 100644
index 0000000000..7ffe5f6d78
--- /dev/null
+++ b/bt5/erp5_payzen_secure_payment/TestTemplateItem/portal_components/test.erp5.testERP5PayzenSecurePayment.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testERP5PayzenSecurePayment</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testERP5PayzenSecurePayment</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844605.76</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_payzen_secure_payment/bt/change_log b/bt5/erp5_payzen_secure_payment/bt/change_log
index 4e881b72bc..8164a45355 100644
--- a/bt5/erp5_payzen_secure_payment/bt/change_log
+++ b/bt5/erp5_payzen_secure_payment/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2013-06-18 arnaud.fontaine
 * message_attribute_does_not_match was incorrectly renamed to message_attribute_match when migrating StringAttributeMatch constraint from filesystem to ZODB. Also, use message_attribute_not_match instead of message_attribute_does_not_match to follow ERP5 naming convention.
 
diff --git a/bt5/erp5_payzen_secure_payment/bt/revision b/bt5/erp5_payzen_secure_payment/bt/revision
index c5b431b6cb..7003e7fe1f 100644
--- a/bt5/erp5_payzen_secure_payment/bt/revision
+++ b/bt5/erp5_payzen_secure_payment/bt/revision
@@ -1 +1 @@
-50
\ No newline at end of file
+51
\ No newline at end of file
diff --git a/bt5/erp5_payzen_secure_payment/bt/template_document_id_list b/bt5/erp5_payzen_secure_payment/bt/template_document_id_list
index 4f408bdadc..24227bd4ff 100644
--- a/bt5/erp5_payzen_secure_payment/bt/template_document_id_list
+++ b/bt5/erp5_payzen_secure_payment/bt/template_document_id_list
@@ -1 +1 @@
-PayzenService
\ No newline at end of file
+document.erp5.PayzenService
\ No newline at end of file
diff --git a/bt5/erp5_payzen_secure_payment/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_payzen_secure_payment/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..1240372445
--- /dev/null
+++ b/bt5/erp5_payzen_secure_payment/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/document.erp5.PayzenService
+portal_components/test.erp5.testERP5PayzenSecurePayment
\ No newline at end of file
diff --git a/bt5/erp5_payzen_secure_payment/bt/template_test_id_list b/bt5/erp5_payzen_secure_payment/bt/template_test_id_list
index b16201bb54..d0dad80efa 100644
--- a/bt5/erp5_payzen_secure_payment/bt/template_test_id_list
+++ b/bt5/erp5_payzen_secure_payment/bt/template_test_id_list
@@ -1 +1 @@
-testERP5PayzenSecurePayment
\ No newline at end of file
+test.erp5.testERP5PayzenSecurePayment
\ No newline at end of file
diff --git a/bt5/erp5_pdf_merge/ExtensionTemplateItem/ERP5PDFMerge.py b/bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.py
similarity index 100%
rename from bt5/erp5_pdf_merge/ExtensionTemplateItem/ERP5PDFMerge.py
rename to bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.py
diff --git a/bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.xml b/bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.xml
new file mode 100644
index 0000000000..4d4aaef058
--- /dev/null
+++ b/bt5/erp5_pdf_merge/ExtensionTemplateItem/portal_components/extension.erp5.ERP5PDFMerge.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ERP5PDFMerge</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ERP5PDFMerge</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844535.24</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_pdf_merge/TestTemplateItem/testERP5PDFMerge.py b/bt5/erp5_pdf_merge/TestTemplateItem/portal_components/test.erp5.testERP5PDFMerge.py
similarity index 100%
rename from bt5/erp5_pdf_merge/TestTemplateItem/testERP5PDFMerge.py
rename to bt5/erp5_pdf_merge/TestTemplateItem/portal_components/test.erp5.testERP5PDFMerge.py
diff --git a/bt5/erp5_pdf_merge/TestTemplateItem/portal_components/test.erp5.testERP5PDFMerge.xml b/bt5/erp5_pdf_merge/TestTemplateItem/portal_components/test.erp5.testERP5PDFMerge.xml
new file mode 100644
index 0000000000..1df1410b32
--- /dev/null
+++ b/bt5/erp5_pdf_merge/TestTemplateItem/portal_components/test.erp5.testERP5PDFMerge.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testERP5PDFMerge</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testERP5PDFMerge</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844535.25</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_pdf_merge/bt/revision b/bt5/erp5_pdf_merge/bt/revision
index d8263ee986..e440e5c842 100644
--- a/bt5/erp5_pdf_merge/bt/revision
+++ b/bt5/erp5_pdf_merge/bt/revision
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ No newline at end of file
diff --git a/bt5/erp5_pdf_merge/bt/template_extension_id_list b/bt5/erp5_pdf_merge/bt/template_extension_id_list
index 7e44d72cac..b564563095 100644
--- a/bt5/erp5_pdf_merge/bt/template_extension_id_list
+++ b/bt5/erp5_pdf_merge/bt/template_extension_id_list
@@ -1 +1 @@
-ERP5PDFMerge
\ No newline at end of file
+extension.erp5.ERP5PDFMerge
\ No newline at end of file
diff --git a/bt5/erp5_pdf_merge/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_pdf_merge/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..6618e7dfeb
--- /dev/null
+++ b/bt5/erp5_pdf_merge/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/extension.erp5.ERP5PDFMerge
+portal_components/test.erp5.testERP5PDFMerge
\ No newline at end of file
diff --git a/bt5/erp5_pdf_merge/bt/template_test_id_list b/bt5/erp5_pdf_merge/bt/template_test_id_list
index 7454e573fb..0345bfdd64 100644
--- a/bt5/erp5_pdf_merge/bt/template_test_id_list
+++ b/bt5/erp5_pdf_merge/bt/template_test_id_list
@@ -1 +1 @@
-testERP5PDFMerge
\ No newline at end of file
+test.erp5.testERP5PDFMerge
\ No newline at end of file
diff --git a/bt5/erp5_safeimage/DocumentTemplateItem/TileImage.py b/bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImage.py
similarity index 100%
rename from bt5/erp5_safeimage/DocumentTemplateItem/TileImage.py
rename to bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImage.py
diff --git a/bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImage.xml b/bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImage.xml
new file mode 100644
index 0000000000..230f27b9e0
--- /dev/null
+++ b/bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImage.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TileImage</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.TileImage</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844671.97</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_safeimage/DocumentTemplateItem/TileImageTransformed.py b/bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImageTransformed.py
similarity index 100%
rename from bt5/erp5_safeimage/DocumentTemplateItem/TileImageTransformed.py
rename to bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImageTransformed.py
diff --git a/bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImageTransformed.xml b/bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImageTransformed.xml
new file mode 100644
index 0000000000..14c02fb48c
--- /dev/null
+++ b/bt5/erp5_safeimage/DocumentTemplateItem/portal_components/document.erp5.TileImageTransformed.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TileImageTransformed</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.TileImageTransformed</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844671.98</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_safeimage/ExtensionTemplateItem/ERP5SafeImage_Selenium.py b/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5SafeImage_Selenium.py
similarity index 100%
rename from bt5/erp5_safeimage/ExtensionTemplateItem/ERP5SafeImage_Selenium.py
rename to bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5SafeImage_Selenium.py
diff --git a/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5SafeImage_Selenium.xml b/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5SafeImage_Selenium.xml
new file mode 100644
index 0000000000..d7145c1f42
--- /dev/null
+++ b/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5SafeImage_Selenium.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ERP5SafeImage_Selenium</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ERP5SafeImage_Selenium</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844671.99</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_safeimage/ExtensionTemplateItem/ERP5ZoomifyImage.py b/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py
similarity index 100%
rename from bt5/erp5_safeimage/ExtensionTemplateItem/ERP5ZoomifyImage.py
rename to bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py
diff --git a/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.xml b/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.xml
new file mode 100644
index 0000000000..25eaf1870e
--- /dev/null
+++ b/bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ERP5ZoomifyImage</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ERP5ZoomifyImage</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844671.98</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_safeimage/TestTemplateItem/testSafeImage.py b/bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.py
similarity index 100%
rename from bt5/erp5_safeimage/TestTemplateItem/testSafeImage.py
rename to bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.py
diff --git a/bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.xml b/bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.xml
new file mode 100644
index 0000000000..63461876e7
--- /dev/null
+++ b/bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testSafeImage</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testSafeImage</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844671.99</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_safeimage/bt/revision b/bt5/erp5_safeimage/bt/revision
index ca7bf83ac5..da2d3988d7 100644
--- a/bt5/erp5_safeimage/bt/revision
+++ b/bt5/erp5_safeimage/bt/revision
@@ -1 +1 @@
-13
\ No newline at end of file
+14
\ No newline at end of file
diff --git a/bt5/erp5_safeimage/bt/template_document_id_list b/bt5/erp5_safeimage/bt/template_document_id_list
index aa5c553564..eef0412bf0 100644
--- a/bt5/erp5_safeimage/bt/template_document_id_list
+++ b/bt5/erp5_safeimage/bt/template_document_id_list
@@ -1,2 +1,2 @@
-TileImage
-TileImageTransformed
\ No newline at end of file
+document.erp5.TileImage
+document.erp5.TileImageTransformed
\ No newline at end of file
diff --git a/bt5/erp5_safeimage/bt/template_extension_id_list b/bt5/erp5_safeimage/bt/template_extension_id_list
index f68a94cffa..7f8c1a9263 100644
--- a/bt5/erp5_safeimage/bt/template_extension_id_list
+++ b/bt5/erp5_safeimage/bt/template_extension_id_list
@@ -1,2 +1,2 @@
-ERP5SafeImage_Selenium
-ERP5ZoomifyImage
\ No newline at end of file
+extension.erp5.ERP5ZoomifyImage
+extension.erp5.ERP5SafeImage_Selenium
\ No newline at end of file
diff --git a/bt5/erp5_safeimage/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_safeimage/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..5eece4620d
--- /dev/null
+++ b/bt5/erp5_safeimage/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,5 @@
+portal_components/document.erp5.TileImage
+portal_components/document.erp5.TileImageTransformed
+portal_components/extension.erp5.ERP5ZoomifyImage
+portal_components/extension.erp5.ERP5SafeImage_Selenium
+portal_components/test.erp5.testSafeImage
\ No newline at end of file
diff --git a/bt5/erp5_safeimage/bt/template_test_id_list b/bt5/erp5_safeimage/bt/template_test_id_list
index 5bf1c89d73..9d8893ab4d 100644
--- a/bt5/erp5_safeimage/bt/template_test_id_list
+++ b/bt5/erp5_safeimage/bt/template_test_id_list
@@ -1 +1 @@
-testSafeImage
\ No newline at end of file
+test.erp5.testSafeImage
\ No newline at end of file
diff --git a/bt5/erp5_social_contracts/TestTemplateItem/testERP5SocialContracts.py b/bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.py
similarity index 100%
rename from bt5/erp5_social_contracts/TestTemplateItem/testERP5SocialContracts.py
rename to bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.py
diff --git a/bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.xml b/bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.xml
new file mode 100644
index 0000000000..cfa0bab0f7
--- /dev/null
+++ b/bt5/erp5_social_contracts/TestTemplateItem/portal_components/test.erp5.testERP5SocialContracts.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testERP5SocialContracts</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testERP5SocialContracts</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844663.46</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_social_contracts/bt/change_log b/bt5/erp5_social_contracts/bt/change_log
index c4e6ba3bc0..fdca8a89c9 100644
--- a/bt5/erp5_social_contracts/bt/change_log
+++ b/bt5/erp5_social_contracts/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2008-01-31 jerome
 * Initial version
\ No newline at end of file
diff --git a/bt5/erp5_social_contracts/bt/revision b/bt5/erp5_social_contracts/bt/revision
index 978b4e8e51..a5c750feac 100644
--- a/bt5/erp5_social_contracts/bt/revision
+++ b/bt5/erp5_social_contracts/bt/revision
@@ -1 +1 @@
-26
\ No newline at end of file
+27
\ No newline at end of file
diff --git a/bt5/erp5_social_contracts/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_social_contracts/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..55bc7fb073
--- /dev/null
+++ b/bt5/erp5_social_contracts/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testERP5SocialContracts
\ No newline at end of file
diff --git a/bt5/erp5_social_contracts/bt/template_test_id_list b/bt5/erp5_social_contracts/bt/template_test_id_list
index abe9c0d827..ad2b680fba 100644
--- a/bt5/erp5_social_contracts/bt/template_test_id_list
+++ b/bt5/erp5_social_contracts/bt/template_test_id_list
@@ -1 +1 @@
-testERP5SocialContracts
\ No newline at end of file
+test.erp5.testERP5SocialContracts
\ No newline at end of file
diff --git a/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py b/bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareLicence.py
similarity index 100%
rename from bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareLicence.py
rename to bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareLicence.py
diff --git a/bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareLicence.xml b/bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareLicence.xml
new file mode 100644
index 0000000000..13e09345f3
--- /dev/null
+++ b/bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareLicence.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>SoftwareLicence</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.SoftwareLicence</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844695.76</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareProduct.py b/bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareProduct.py
similarity index 100%
rename from bt5/erp5_software_pdm/DocumentTemplateItem/SoftwareProduct.py
rename to bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareProduct.py
diff --git a/bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareProduct.xml b/bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareProduct.xml
new file mode 100644
index 0000000000..01fab2f52e
--- /dev/null
+++ b/bt5/erp5_software_pdm/DocumentTemplateItem/portal_components/document.erp5.SoftwareProduct.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>SoftwareProduct</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.SoftwareProduct</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844695.76</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_software_pdm/bt/change_log b/bt5/erp5_software_pdm/bt/change_log
index c251bf576d..3579ce1cf6 100644
--- a/bt5/erp5_software_pdm/bt/change_log
+++ b/bt5/erp5_software_pdm/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-12-10 romain
 * Move software release stuff from erp5_forge_release.
 
diff --git a/bt5/erp5_software_pdm/bt/revision b/bt5/erp5_software_pdm/bt/revision
index 27a37eb577..bd753ccc4b 100644
--- a/bt5/erp5_software_pdm/bt/revision
+++ b/bt5/erp5_software_pdm/bt/revision
@@ -1 +1 @@
-93
\ No newline at end of file
+94
\ No newline at end of file
diff --git a/bt5/erp5_software_pdm/bt/template_document_id_list b/bt5/erp5_software_pdm/bt/template_document_id_list
index 641acafa14..2357b03241 100644
--- a/bt5/erp5_software_pdm/bt/template_document_id_list
+++ b/bt5/erp5_software_pdm/bt/template_document_id_list
@@ -1,2 +1,2 @@
-SoftwareProduct
-SoftwareLicence
\ No newline at end of file
+document.erp5.SoftwareLicence
+document.erp5.SoftwareProduct
\ No newline at end of file
diff --git a/bt5/erp5_software_pdm/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_software_pdm/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..7f2663b100
--- /dev/null
+++ b/bt5/erp5_software_pdm/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,2 @@
+portal_components/document.erp5.SoftwareLicence
+portal_components/document.erp5.SoftwareProduct
\ No newline at end of file
diff --git a/bt5/erp5_sso_openam/ExtensionTemplateItem/OpenAMLogout.py b/bt5/erp5_sso_openam/ExtensionTemplateItem/portal_components/extension.erp5.OpenAMLogout.py
similarity index 100%
rename from bt5/erp5_sso_openam/ExtensionTemplateItem/OpenAMLogout.py
rename to bt5/erp5_sso_openam/ExtensionTemplateItem/portal_components/extension.erp5.OpenAMLogout.py
diff --git a/bt5/erp5_sso_openam/ExtensionTemplateItem/portal_components/extension.erp5.OpenAMLogout.xml b/bt5/erp5_sso_openam/ExtensionTemplateItem/portal_components/extension.erp5.OpenAMLogout.xml
new file mode 100644
index 0000000000..21fce5a536
--- /dev/null
+++ b/bt5/erp5_sso_openam/ExtensionTemplateItem/portal_components/extension.erp5.OpenAMLogout.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>OpenAMLogout</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.OpenAMLogout</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844526.18</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_sso_openam/bt/change_log b/bt5/erp5_sso_openam/bt/change_log
index 3eb10bbba7..1528b6b99c 100644
--- a/bt5/erp5_sso_openam/bt/change_log
+++ b/bt5/erp5_sso_openam/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-11-22 Kazuhiko
 * initial import.
\ No newline at end of file
diff --git a/bt5/erp5_sso_openam/bt/revision b/bt5/erp5_sso_openam/bt/revision
index e440e5c842..bf0d87ab1b 100644
--- a/bt5/erp5_sso_openam/bt/revision
+++ b/bt5/erp5_sso_openam/bt/revision
@@ -1 +1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/bt5/erp5_sso_openam/bt/template_extension_id_list b/bt5/erp5_sso_openam/bt/template_extension_id_list
index 2b56f2baf0..70fb37b1f6 100644
--- a/bt5/erp5_sso_openam/bt/template_extension_id_list
+++ b/bt5/erp5_sso_openam/bt/template_extension_id_list
@@ -1 +1 @@
-OpenAMLogout
\ No newline at end of file
+extension.erp5.OpenAMLogout
\ No newline at end of file
diff --git a/bt5/erp5_sso_openam/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_sso_openam/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..79623741d4
--- /dev/null
+++ b/bt5/erp5_sso_openam/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.OpenAMLogout
\ No newline at end of file
diff --git a/bt5/erp5_syncml/ExtensionTemplateItem/__init__.py b/bt5/erp5_syncml/ExtensionTemplateItem/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_syncml/ExtensionTemplateItem/SyncMLTool.py b/bt5/erp5_syncml/ExtensionTemplateItem/portal_components/extension.erp5.SyncMLTool.py
similarity index 100%
rename from bt5/erp5_syncml/ExtensionTemplateItem/SyncMLTool.py
rename to bt5/erp5_syncml/ExtensionTemplateItem/portal_components/extension.erp5.SyncMLTool.py
diff --git a/bt5/erp5_syncml/ExtensionTemplateItem/portal_components/extension.erp5.SyncMLTool.xml b/bt5/erp5_syncml/ExtensionTemplateItem/portal_components/extension.erp5.SyncMLTool.xml
new file mode 100644
index 0000000000..46ded41e58
--- /dev/null
+++ b/bt5/erp5_syncml/ExtensionTemplateItem/portal_components/extension.erp5.SyncMLTool.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>SyncMLTool</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.SyncMLTool</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844521.87</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_syncml/bt/change_log b/bt5/erp5_syncml/bt/change_log
index 632962a009..576f4454a5 100644
--- a/bt5/erp5_syncml/bt/change_log
+++ b/bt5/erp5_syncml/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-02-04 aurel
 New version of the bt5 with all syncml document as ERP5 Object
\ No newline at end of file
diff --git a/bt5/erp5_syncml/bt/revision b/bt5/erp5_syncml/bt/revision
index a46c9d2265..69226f7293 100644
--- a/bt5/erp5_syncml/bt/revision
+++ b/bt5/erp5_syncml/bt/revision
@@ -1 +1 @@
-91
\ No newline at end of file
+92
\ No newline at end of file
diff --git a/bt5/erp5_syncml/bt/template_extension_id_list b/bt5/erp5_syncml/bt/template_extension_id_list
index 2e6106e8a4..64f906fef9 100644
--- a/bt5/erp5_syncml/bt/template_extension_id_list
+++ b/bt5/erp5_syncml/bt/template_extension_id_list
@@ -1 +1 @@
-SyncMLTool
\ No newline at end of file
+extension.erp5.SyncMLTool
\ No newline at end of file
diff --git a/bt5/erp5_syncml/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_syncml/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..57bb131694
--- /dev/null
+++ b/bt5/erp5_syncml/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.SyncMLTool
\ No newline at end of file
diff --git a/bt5/erp5_syncml_test_data/TestTemplateItem/testSyncMLAsynchronousEngine.py b/bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.py
similarity index 100%
rename from bt5/erp5_syncml_test_data/TestTemplateItem/testSyncMLAsynchronousEngine.py
rename to bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.py
diff --git a/bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.xml b/bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.xml
new file mode 100644
index 0000000000..4c27d8ff80
--- /dev/null
+++ b/bt5/erp5_syncml_test_data/TestTemplateItem/portal_components/test.erp5.testSyncMLAsynchronousEngine.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testSyncMLAsynchronousEngine</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testSyncMLAsynchronousEngine</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844644.1</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_syncml_test_data/bt/change_log b/bt5/erp5_syncml_test_data/bt/change_log
index c747ecd943..bdb18da2e3 100644
--- a/bt5/erp5_syncml_test_data/bt/change_log
+++ b/bt5/erp5_syncml_test_data/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2012-01-09 Aurel :
 - initial version
\ No newline at end of file
diff --git a/bt5/erp5_syncml_test_data/bt/revision b/bt5/erp5_syncml_test_data/bt/revision
index e440e5c842..bf0d87ab1b 100644
--- a/bt5/erp5_syncml_test_data/bt/revision
+++ b/bt5/erp5_syncml_test_data/bt/revision
@@ -1 +1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/bt5/erp5_syncml_test_data/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_syncml_test_data/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..d04ab84b34
--- /dev/null
+++ b/bt5/erp5_syncml_test_data/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testSyncMLAsynchronousEngine
\ No newline at end of file
diff --git a/bt5/erp5_syncml_test_data/bt/template_test_id_list b/bt5/erp5_syncml_test_data/bt/template_test_id_list
index fa0be117d4..b647d6433c 100644
--- a/bt5/erp5_syncml_test_data/bt/template_test_id_list
+++ b/bt5/erp5_syncml_test_data/bt/template_test_id_list
@@ -1 +1 @@
-testSyncMLAsynchronousEngine
\ No newline at end of file
+test.erp5.testSyncMLAsynchronousEngine
\ No newline at end of file
diff --git a/bt5/erp5_test_result/DocumentTemplateItem/TestNode.py b/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestNode.py
similarity index 100%
rename from bt5/erp5_test_result/DocumentTemplateItem/TestNode.py
rename to bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestNode.py
diff --git a/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestNode.xml b/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestNode.xml
new file mode 100644
index 0000000000..d9cf198f79
--- /dev/null
+++ b/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestNode.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TestNode</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.TestNode</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844621.25</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_test_result/DocumentTemplateItem/TestSuite.py b/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.py
similarity index 100%
rename from bt5/erp5_test_result/DocumentTemplateItem/TestSuite.py
rename to bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.py
diff --git a/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.xml b/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.xml
new file mode 100644
index 0000000000..8daf4df2f6
--- /dev/null
+++ b/bt5/erp5_test_result/DocumentTemplateItem/portal_components/document.erp5.TestSuite.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TestSuite</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.TestSuite</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844621.26</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_test_result/ExtensionTemplateItem/TestResults.py b/bt5/erp5_test_result/ExtensionTemplateItem/portal_components/extension.erp5.TestResults.py
similarity index 100%
rename from bt5/erp5_test_result/ExtensionTemplateItem/TestResults.py
rename to bt5/erp5_test_result/ExtensionTemplateItem/portal_components/extension.erp5.TestResults.py
diff --git a/bt5/erp5_test_result/ExtensionTemplateItem/portal_components/extension.erp5.TestResults.xml b/bt5/erp5_test_result/ExtensionTemplateItem/portal_components/extension.erp5.TestResults.xml
new file mode 100644
index 0000000000..c5709c26b9
--- /dev/null
+++ b/bt5/erp5_test_result/ExtensionTemplateItem/portal_components/extension.erp5.TestResults.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TestResults</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.TestResults</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844621.26</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_test_result/TestTemplateItem/testTaskDistribution.py b/bt5/erp5_test_result/TestTemplateItem/portal_components/test.erp5.testTaskDistribution.py
similarity index 100%
rename from bt5/erp5_test_result/TestTemplateItem/testTaskDistribution.py
rename to bt5/erp5_test_result/TestTemplateItem/portal_components/test.erp5.testTaskDistribution.py
diff --git a/bt5/erp5_test_result/TestTemplateItem/portal_components/test.erp5.testTaskDistribution.xml b/bt5/erp5_test_result/TestTemplateItem/portal_components/test.erp5.testTaskDistribution.xml
new file mode 100644
index 0000000000..fdb0bb4df6
--- /dev/null
+++ b/bt5/erp5_test_result/TestTemplateItem/portal_components/test.erp5.testTaskDistribution.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testTaskDistribution</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testTaskDistribution</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844621.27</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_test_result/bt/change_log b/bt5/erp5_test_result/bt/change_log
index e46ef2e2f5..7b766f4820 100644
--- a/bt5/erp5_test_result/bt/change_log
+++ b/bt5/erp5_test_result/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-07-07 arnaud.fontaine
 * Add Benchmark Result and Benchmark Result Line for scalability testing results.
 
diff --git a/bt5/erp5_test_result/bt/revision b/bt5/erp5_test_result/bt/revision
index cb16690c5e..8a32cf7839 100644
--- a/bt5/erp5_test_result/bt/revision
+++ b/bt5/erp5_test_result/bt/revision
@@ -1 +1 @@
-249
\ No newline at end of file
+250
\ No newline at end of file
diff --git a/bt5/erp5_test_result/bt/template_document_id_list b/bt5/erp5_test_result/bt/template_document_id_list
index fd80a990bb..c6746b441b 100644
--- a/bt5/erp5_test_result/bt/template_document_id_list
+++ b/bt5/erp5_test_result/bt/template_document_id_list
@@ -1,2 +1,2 @@
-TestSuite
-TestNode
\ No newline at end of file
+document.erp5.TestNode
+document.erp5.TestSuite
\ No newline at end of file
diff --git a/bt5/erp5_test_result/bt/template_extension_id_list b/bt5/erp5_test_result/bt/template_extension_id_list
index 9d9befe4b7..0c4b6ce305 100644
--- a/bt5/erp5_test_result/bt/template_extension_id_list
+++ b/bt5/erp5_test_result/bt/template_extension_id_list
@@ -1 +1 @@
-TestResults
\ No newline at end of file
+extension.erp5.TestResults
\ No newline at end of file
diff --git a/bt5/erp5_test_result/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_test_result/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..1d3553cf57
--- /dev/null
+++ b/bt5/erp5_test_result/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,4 @@
+portal_components/document.erp5.TestNode
+portal_components/document.erp5.TestSuite
+portal_components/extension.erp5.TestResults
+portal_components/test.erp5.testTaskDistribution
\ No newline at end of file
diff --git a/bt5/erp5_test_result/bt/template_test_id_list b/bt5/erp5_test_result/bt/template_test_id_list
index 96df24cfba..d5a1d04d6d 100644
--- a/bt5/erp5_test_result/bt/template_test_id_list
+++ b/bt5/erp5_test_result/bt/template_test_id_list
@@ -1 +1 @@
-testTaskDistribution
\ No newline at end of file
+test.erp5.testTaskDistribution
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_core/DocumentTemplateItem/WebServiceConnector.py b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceConnector.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/DocumentTemplateItem/WebServiceConnector.py
rename to bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceConnector.py
diff --git a/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceConnector.xml b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceConnector.xml
new file mode 100644
index 0000000000..82b762b346
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceConnector.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>WebServiceConnector</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.WebServiceConnector</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.4</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/DocumentTemplateItem/WebServiceRequest.py b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequest.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/DocumentTemplateItem/WebServiceRequest.py
rename to bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequest.py
diff --git a/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequest.xml b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequest.xml
new file mode 100644
index 0000000000..6227511774
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequest.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>WebServiceRequest</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.WebServiceRequest</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.4</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/DocumentTemplateItem/WebServiceRequestGroup.py b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequestGroup.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/DocumentTemplateItem/WebServiceRequestGroup.py
rename to bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequestGroup.py
diff --git a/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequestGroup.xml b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequestGroup.xml
new file mode 100644
index 0000000000..f76437ad11
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequestGroup.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>WebServiceRequestGroup</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.WebServiceRequestGroup</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.39</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/ERP5DeliveredNodeConduit.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/ERP5DeliveredNodeConduit.py
deleted file mode 100644
index 81ba642906..0000000000
--- a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/ERP5DeliveredNodeConduit.py
+++ /dev/null
@@ -1,70 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2002-2010 Nexedi SA and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-##############################################################################
-
-from Products.ERP5TioSafe.Conduit.ERP5NodeConduit import ERP5NodeConduit
-
-
-class ERP5DeliveredNodeConduit(ERP5NodeConduit):
-
-  def _createSaleTradeCondition(self, object, **kw):
-    """ Link person to a sale trade condition so that
-    we can filter person based on the plugin they came from
-    """
-    site = self.getIntegrationSite(kw['domain'])
-    default_stc = site.getSourceTrade()
-    # Create the STC
-    stc = object.getPortalObject().sale_trade_condition_module.newContent(title="%s %s" %(site.getReference(), object.getTitle()),
-                                                                        specialise=default_stc,
-                                                                        destination=object.getRelativeUrl(),
-                                                                        version=001)
-    stc.validate()
-
-  def _updateSaleTradeCondition(self, object, **kw):
-    """ Link person to a sale trade condition so that
-    we can filter person based on the plugin they came from
-    """
-    site = self.getIntegrationSite(kw['domain'])
-    default_stc = site.getSourceTrade()
-    # try to find the corresponding STC
-    stc_list = object.getPortalObject().sale_trade_condition_module.searchFolder(title="%s %s" %(site.getReference(), object.getTitle()),
-                                                                                validation_state="validated"
-                                                                                )
-    if len(stc_list) == 0:
-      self._createSaleTradeCondition(object, **kw)
-    elif len(stc_list) > 1:
-      raise ValueError, "Multiple trade condition (%s) retrieve for %s" %([x.path for x in stc_list], object.getTitle())
-    else:
-      stc = stc_list[0].getObject()
-      stc.edit(destination=object.getRelativeUrl(),)
-
-
-  def _deleteSaleTradeCondition(self, object):
-    stc_list = object.Base_getRelatedObjectList(portal_type="Sale Trade Condition",
-                                     validation_state="validated")
-    for stc in stc_list:
-      stc = stc.getObject()
-      stc.edit(destination=None)
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/ERP5InvoicedNodeConduit.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/ERP5InvoicedNodeConduit.py
deleted file mode 100644
index 765272cf65..0000000000
--- a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/ERP5InvoicedNodeConduit.py
+++ /dev/null
@@ -1,75 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2002-2010 Nexedi SA and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-##############################################################################
-
-from Products.ERP5TioSafe.Conduit.ERP5NodeConduit import ERP5NodeConduit
-
-
-class ERP5InvoicedNodeConduit(ERP5NodeConduit):
-
-
-  def _createSaleTradeCondition(self, object, **kw):
-    """ Link person to a sale trade condition so that
-    we can filter person based on the plugin they came from
-    """
-    site = self.getIntegrationSite(kw['domain'])
-    default_stc = site.getSourceTrade()
-    # Create the STC
-    stc = object.getPortalObject().sale_trade_condition_module.newContent(title="%s %s" %(site.getReference(), object.getTitle()),
-                                                                        specialise=default_stc,
-                                                                        destination_decision=object.getRelativeUrl(),
-                                                                        destination_administration=object.getRelativeUrl(),
-                                                                        version=001)
-    stc.validate()
-
-  def _updateSaleTradeCondition(self, object, **kw):
-    """ Link person to a sale trade condition so that
-    we can filter person based on the plugin they came from
-    """
-    site = self.getIntegrationSite(kw['domain'])
-    default_stc = site.getSourceTrade()
-    # try to find the corresponding STC
-    stc_list = object.getPortalObject().sale_trade_condition_module.searchFolder(title="%s %s" %(site.getReference(), object.getTitle()),
-                                                                                validation_state="validated"
-                                                                                )
-    if len(stc_list) == 0:
-      self._createSaleTradeCondition(object, **kw)
-    elif len(stc_list) > 1:
-      raise ValueError, "Multiple trade condition (%s) retrieve for %s" %([x.path for x in stc_list], object.getTitle())
-    else:
-      stc = stc_list[0].getObject()
-      stc.edit(destination_decision=object.getRelativeUrl(),
-               destination_administration=object.getRelativeUrl(),)
-
-
-  def _deleteSaleTradeCondition(self, object):
-    stc_list = object.Base_getRelatedObjectList(portal_type="Sale Trade Condition",
-                                     validation_state="validated")
-    for stc in stc_list:
-      stc = stc.getObject()
-      stc.edit(destination_decision=None,
-               destination_administration=None)
-
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/__init__.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeBaseConduit.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBaseConduit.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeBaseConduit.py
rename to bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBaseConduit.py
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBaseConduit.xml b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBaseConduit.xml
new file mode 100644
index 0000000000..0da2666a02
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBaseConduit.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TioSafeBaseConduit</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.TioSafeBaseConduit</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.44</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeBrain.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBrain.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeBrain.py
rename to bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBrain.py
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBrain.xml b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBrain.xml
new file mode 100644
index 0000000000..91ae66f126
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeBrain.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TioSafeBrain</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.TioSafeBrain</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.44</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeDoNothingConduit.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeDoNothingConduit.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeDoNothingConduit.py
rename to bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeDoNothingConduit.py
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeDoNothingConduit.xml b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeDoNothingConduit.xml
new file mode 100644
index 0000000000..579f11085d
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeDoNothingConduit.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TioSafeDoNothingConduit</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.TioSafeDoNothingConduit</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.45</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeNodeConduit.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeNodeConduit.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeNodeConduit.py
rename to bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeNodeConduit.py
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeNodeConduit.xml b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeNodeConduit.xml
new file mode 100644
index 0000000000..8097b7d75c
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeNodeConduit.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TioSafeNodeConduit</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.TioSafeNodeConduit</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.46</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeResourceConduit.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeResourceConduit.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeResourceConduit.py
rename to bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeResourceConduit.py
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeResourceConduit.xml b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeResourceConduit.xml
new file mode 100644
index 0000000000..86c0d9a83d
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeResourceConduit.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TioSafeResourceConduit</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.TioSafeResourceConduit</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.45</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeTool.py b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeTool.py
similarity index 100%
rename from bt5/erp5_tiosafe_core/ExtensionTemplateItem/TioSafeTool.py
rename to bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeTool.py
diff --git a/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeTool.xml b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeTool.xml
new file mode 100644
index 0000000000..4b94a4191c
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/ExtensionTemplateItem/portal_components/extension.erp5.TioSafeTool.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TioSafeTool</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.TioSafeTool</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377854461.46</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_tiosafe_core/bt/change_log b/bt5/erp5_tiosafe_core/bt/change_log
index b4f695d02c..3a01dc4562 100644
--- a/bt5/erp5_tiosafe_core/bt/change_log
+++ b/bt5/erp5_tiosafe_core/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-30 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 * 2010-08-24 aurel
 New data structure for Integration Site
 
diff --git a/bt5/erp5_tiosafe_core/bt/revision b/bt5/erp5_tiosafe_core/bt/revision
index b697ae4122..6f1745c38f 100644
--- a/bt5/erp5_tiosafe_core/bt/revision
+++ b/bt5/erp5_tiosafe_core/bt/revision
@@ -1 +1 @@
-635
\ No newline at end of file
+636
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_core/bt/template_document_id_list b/bt5/erp5_tiosafe_core/bt/template_document_id_list
index 753b47f6f7..352af30839 100644
--- a/bt5/erp5_tiosafe_core/bt/template_document_id_list
+++ b/bt5/erp5_tiosafe_core/bt/template_document_id_list
@@ -1,3 +1,3 @@
-WebServiceConnector
-WebServiceRequest
-WebServiceRequestGroup
\ No newline at end of file
+document.erp5.WebServiceRequestGroup
+document.erp5.WebServiceConnector
+document.erp5.WebServiceRequest
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_core/bt/template_extension_id_list b/bt5/erp5_tiosafe_core/bt/template_extension_id_list
index da5eb24457..049fc53f6f 100644
--- a/bt5/erp5_tiosafe_core/bt/template_extension_id_list
+++ b/bt5/erp5_tiosafe_core/bt/template_extension_id_list
@@ -1,7 +1,6 @@
-TioSafeBrain
-TioSafeTool
-TioSafeBaseConduit
-TioSafeNodeConduit
-TioSafeResourceConduit
-TioSafeDoNothingConduit
-__init__
+extension.erp5.TioSafeBaseConduit
+extension.erp5.TioSafeBrain
+extension.erp5.TioSafeDoNothingConduit
+extension.erp5.TioSafeResourceConduit
+extension.erp5.TioSafeTool
+extension.erp5.TioSafeNodeConduit
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_core/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_tiosafe_core/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..a7b4a31f24
--- /dev/null
+++ b/bt5/erp5_tiosafe_core/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,9 @@
+portal_components/document.erp5.WebServiceRequestGroup
+portal_components/document.erp5.WebServiceConnector
+portal_components/document.erp5.WebServiceRequest
+portal_components/extension.erp5.TioSafeBaseConduit
+portal_components/extension.erp5.TioSafeBrain
+portal_components/extension.erp5.TioSafeDoNothingConduit
+portal_components/extension.erp5.TioSafeResourceConduit
+portal_components/extension.erp5.TioSafeTool
+portal_components/extension.erp5.TioSafeNodeConduit
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_salesforce/PathTemplateItem/portal_integrations/salesforce/event_module/getEmailList.xml b/bt5/erp5_tiosafe_salesforce/PathTemplateItem/portal_integrations/salesforce/event_module/getEmailList.xml
index 48d2a8724d..1c53f3ccba 100644
--- a/bt5/erp5_tiosafe_salesforce/PathTemplateItem/portal_integrations/salesforce/event_module/getEmailList.xml
+++ b/bt5/erp5_tiosafe_salesforce/PathTemplateItem/portal_integrations/salesforce/event_module/getEmailList.xml
@@ -1646,7 +1646,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Subje
   </record>
   <record id="24" aka="AAAAAAAAABg=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3766,7 +3766,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Subje
   </record>
   <record id="91" aka="AAAAAAAAAFs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3829,7 +3829,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Subje
   </record>
   <record id="92" aka="AAAAAAAAAFw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3888,7 +3888,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Subje
   </record>
   <record id="93" aka="AAAAAAAAAF0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3947,7 +3947,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Subje
   </record>
   <record id="94" aka="AAAAAAAAAF4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4148,7 +4148,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="95" aka="AAAAAAAAAF8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6324,7 +6324,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="138" aka="AAAAAAAAAIo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6383,7 +6383,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="139" aka="AAAAAAAAAIs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6446,7 +6446,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="140" aka="AAAAAAAAAIw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6509,7 +6509,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="141" aka="AAAAAAAAAI0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6568,7 +6568,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="142" aka="AAAAAAAAAI4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6627,7 +6627,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="143" aka="AAAAAAAAAI8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6686,7 +6686,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="144" aka="AAAAAAAAAJA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7010,7 +7010,7 @@ USA</sf:BillingStreet><sf:BillingPostalCode xsi:nil="true"/><sf:BillingCity>New
   </record>
   <record id="145" aka="AAAAAAAAAJE=">
     <pickle>
-      <global name="WebServiceRequestGroup" module="erp5.document.WebServiceRequestGroup"/>
+      <global name="WebServiceRequestGroup" module="erp5.component.document.WebServiceRequestGroup"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7070,7 +7070,7 @@ USA</sf:BillingStreet><sf:BillingPostalCode xsi:nil="true"/><sf:BillingCity>New
   </record>
   <record id="146" aka="AAAAAAAAAJI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7237,7 +7237,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="147" aka="AAAAAAAAAJM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7296,7 +7296,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="148" aka="AAAAAAAAAJQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8507,7 +8507,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="171" aka="AAAAAAAAAKs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8566,7 +8566,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="172" aka="AAAAAAAAAKw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8629,7 +8629,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="173" aka="AAAAAAAAAK0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8692,7 +8692,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="174" aka="AAAAAAAAAK4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8751,7 +8751,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="175" aka="AAAAAAAAAK8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8810,7 +8810,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="176" aka="AAAAAAAAALA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8880,7 +8880,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="177" aka="AAAAAAAAALE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9199,7 +9199,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="178" aka="AAAAAAAAALI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9345,7 +9345,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="179" aka="AAAAAAAAALM=">
     <pickle>
-      <global name="WebServiceRequestGroup" module="erp5.document.WebServiceRequestGroup"/>
+      <global name="WebServiceRequestGroup" module="erp5.component.document.WebServiceRequestGroup"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9405,7 +9405,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="180" aka="AAAAAAAAALQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9551,7 +9551,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="181" aka="AAAAAAAAALU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9610,7 +9610,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="182" aka="AAAAAAAAALY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9937,7 +9937,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="189" aka="AAAAAAAAAL0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10000,7 +10000,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="190" aka="AAAAAAAAAL4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10059,7 +10059,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="191" aka="AAAAAAAAAL8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10118,7 +10118,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="192" aka="AAAAAAAAAMA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10364,7 +10364,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="193" aka="AAAAAAAAAME=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10448,7 +10448,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="195" aka="AAAAAAAAAMM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10511,7 +10511,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="196" aka="AAAAAAAAAMQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10570,7 +10570,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="197" aka="AAAAAAAAAMU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10629,7 +10629,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="198" aka="AAAAAAAAAMY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11155,7 +11155,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="199" aka="AAAAAAAAAMc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11214,7 +11214,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="200" aka="AAAAAAAAAMg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11277,7 +11277,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="201" aka="AAAAAAAAAMk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11336,7 +11336,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="202" aka="AAAAAAAAAMo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11395,7 +11395,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="203" aka="AAAAAAAAAMs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11454,7 +11454,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="204" aka="AAAAAAAAAMw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11513,7 +11513,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="205" aka="AAAAAAAAAM0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11572,7 +11572,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="206" aka="AAAAAAAAAM4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11631,7 +11631,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="207" aka="AAAAAAAAAM8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11690,7 +11690,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="208" aka="AAAAAAAAANA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11749,7 +11749,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="209" aka="AAAAAAAAANE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11808,7 +11808,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="210" aka="AAAAAAAAANI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11867,7 +11867,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="211" aka="AAAAAAAAANM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11926,7 +11926,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="212" aka="AAAAAAAAANQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11985,7 +11985,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="213" aka="AAAAAAAAANU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12044,7 +12044,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="214" aka="AAAAAAAAANY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12103,7 +12103,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="215" aka="AAAAAAAAANc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12162,7 +12162,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="216" aka="AAAAAAAAANg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12221,7 +12221,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="217" aka="AAAAAAAAANk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12280,7 +12280,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="218" aka="AAAAAAAAANo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12339,7 +12339,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, N
   </record>
   <record id="219" aka="AAAAAAAAANs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12525,7 +12525,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, S
   </record>
   <record id="220" aka="AAAAAAAAANw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12701,7 +12701,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="221" aka="AAAAAAAAAN0=">
     <pickle>
-      <global name="WebServiceRequestGroup" module="erp5.document.WebServiceRequestGroup"/>
+      <global name="WebServiceRequestGroup" module="erp5.component.document.WebServiceRequestGroup"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12761,7 +12761,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="222" aka="AAAAAAAAAN4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12820,7 +12820,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="223" aka="AAAAAAAAAN8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12879,7 +12879,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="224" aka="AAAAAAAAAOA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12938,7 +12938,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="225" aka="AAAAAAAAAOE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12997,7 +12997,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="226" aka="AAAAAAAAAOI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13056,7 +13056,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="227" aka="AAAAAAAAAOM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13115,7 +13115,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="228" aka="AAAAAAAAAOQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13174,7 +13174,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="229" aka="AAAAAAAAAOU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13233,7 +13233,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="230" aka="AAAAAAAAAOY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14292,7 +14292,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="249" aka="AAAAAAAAAPk=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15060,7 +15060,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="280" aka="AAAAAAAAARg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15112,7 +15112,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="281" aka="AAAAAAAAARk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15160,7 +15160,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="282" aka="AAAAAAAAARo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15208,7 +15208,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="283" aka="AAAAAAAAARs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15346,7 +15346,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="284" aka="AAAAAAAAARw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15419,7 +15419,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="286" aka="AAAAAAAAAR4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15471,7 +15471,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="287" aka="AAAAAAAAAR8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15519,7 +15519,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="288" aka="AAAAAAAAASA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15567,7 +15567,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="289" aka="AAAAAAAAASE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15705,7 +15705,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="290" aka="AAAAAAAAASI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15808,7 +15808,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="292" aka="AAAAAAAAASQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15860,7 +15860,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="293" aka="AAAAAAAAASU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15908,7 +15908,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="294" aka="AAAAAAAAASY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15956,7 +15956,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="295" aka="AAAAAAAAASc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16004,7 +16004,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="296" aka="AAAAAAAAASg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16052,7 +16052,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="297" aka="AAAAAAAAASk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16100,7 +16100,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="298" aka="AAAAAAAAASo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16148,7 +16148,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="299" aka="AAAAAAAAASs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16196,7 +16196,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="300" aka="AAAAAAAAASw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16244,7 +16244,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="301" aka="AAAAAAAAAS0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16292,7 +16292,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="302" aka="AAAAAAAAAS4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16340,7 +16340,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="303" aka="AAAAAAAAAS8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16388,7 +16388,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="304" aka="AAAAAAAAATA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16436,7 +16436,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="305" aka="AAAAAAAAATE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16500,7 +16500,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="306" aka="AAAAAAAAATI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16548,7 +16548,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="307" aka="AAAAAAAAATM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16596,7 +16596,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="308" aka="AAAAAAAAATQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16644,7 +16644,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="309" aka="AAAAAAAAATU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16692,7 +16692,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="310" aka="AAAAAAAAATY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16740,7 +16740,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="311" aka="AAAAAAAAATc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16861,7 +16861,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="313" aka="AAAAAAAAATk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16913,7 +16913,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="314" aka="AAAAAAAAATo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16961,7 +16961,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="315" aka="AAAAAAAAATs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17009,7 +17009,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="316" aka="AAAAAAAAATw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17057,7 +17057,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="317" aka="AAAAAAAAAT0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17105,7 +17105,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="318" aka="AAAAAAAAAT4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17153,7 +17153,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="319" aka="AAAAAAAAAT8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17201,7 +17201,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="320" aka="AAAAAAAAAUA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17249,7 +17249,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="321" aka="AAAAAAAAAUE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17297,7 +17297,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="322" aka="AAAAAAAAAUI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17345,7 +17345,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="323" aka="AAAAAAAAAUM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17393,7 +17393,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="324" aka="AAAAAAAAAUQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17441,7 +17441,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="325" aka="AAAAAAAAAUU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17489,7 +17489,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="326" aka="AAAAAAAAAUY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17537,7 +17537,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="327" aka="AAAAAAAAAUc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17585,7 +17585,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="328" aka="AAAAAAAAAUg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17633,7 +17633,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="329" aka="AAAAAAAAAUk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17681,7 +17681,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="330" aka="AAAAAAAAAUo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17729,7 +17729,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="331" aka="AAAAAAAAAUs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17777,7 +17777,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="332" aka="AAAAAAAAAUw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17841,7 +17841,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="333" aka="AAAAAAAAAU0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17889,7 +17889,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="334" aka="AAAAAAAAAU4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17937,7 +17937,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="335" aka="AAAAAAAAAU8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17985,7 +17985,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="336" aka="AAAAAAAAAVA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18033,7 +18033,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="337" aka="AAAAAAAAAVE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18081,7 +18081,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="338" aka="AAAAAAAAAVI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18129,7 +18129,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="339" aka="AAAAAAAAAVM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18177,7 +18177,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="340" aka="AAAAAAAAAVQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18225,7 +18225,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="341" aka="AAAAAAAAAVU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18306,7 +18306,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="343" aka="AAAAAAAAAVc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18354,7 +18354,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="344" aka="AAAAAAAAAVg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18406,7 +18406,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="345" aka="AAAAAAAAAVk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18454,7 +18454,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="346" aka="AAAAAAAAAVo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18502,7 +18502,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="347" aka="AAAAAAAAAVs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18550,7 +18550,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="348" aka="AAAAAAAAAVw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18598,7 +18598,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="349" aka="AAAAAAAAAV0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18662,7 +18662,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="350" aka="AAAAAAAAAV4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18710,7 +18710,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="351" aka="AAAAAAAAAV8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19101,7 +19101,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="361" aka="AAAAAAAAAWk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19149,7 +19149,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="362" aka="AAAAAAAAAWo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19201,7 +19201,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="363" aka="AAAAAAAAAWs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19249,7 +19249,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="364" aka="AAAAAAAAAWw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19297,7 +19297,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="365" aka="AAAAAAAAAW0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19345,7 +19345,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="366" aka="AAAAAAAAAW4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19393,7 +19393,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="367" aka="AAAAAAAAAW8=">
     <pickle>
-      <global name="WebServiceRequestGroup" module="erp5.document.WebServiceRequestGroup"/>
+      <global name="WebServiceRequestGroup" module="erp5.component.document.WebServiceRequestGroup"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19442,7 +19442,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="368" aka="AAAAAAAAAXA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19584,7 +19584,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="369" aka="AAAAAAAAAXE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19632,7 +19632,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="370" aka="AAAAAAAAAXI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19705,7 +19705,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="372" aka="AAAAAAAAAXQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19757,7 +19757,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="373" aka="AAAAAAAAAXU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19805,7 +19805,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="374" aka="AAAAAAAAAXY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19853,7 +19853,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="375" aka="AAAAAAAAAXc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19923,7 +19923,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="376" aka="AAAAAAAAAXg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19996,7 +19996,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="378" aka="AAAAAAAAAXo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20048,7 +20048,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="379" aka="AAAAAAAAAXs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20096,7 +20096,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="380" aka="AAAAAAAAAXw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20144,7 +20144,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="381" aka="AAAAAAAAAX0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20284,7 +20284,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="382" aka="AAAAAAAAAX4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21187,7 +21187,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="398" aka="AAAAAAAAAY4=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21858,7 +21858,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="426" aka="AAAAAAAAAao=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21910,7 +21910,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="427" aka="AAAAAAAAAas=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21958,7 +21958,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="428" aka="AAAAAAAAAaw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22006,7 +22006,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="429" aka="AAAAAAAAAa0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22070,7 +22070,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="430" aka="AAAAAAAAAa4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22143,7 +22143,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="432" aka="AAAAAAAAAbA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22195,7 +22195,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="433" aka="AAAAAAAAAbE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22243,7 +22243,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="434" aka="AAAAAAAAAbI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22291,7 +22291,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="435" aka="AAAAAAAAAbM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22355,7 +22355,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="436" aka="AAAAAAAAAbQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22458,7 +22458,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="438" aka="AAAAAAAAAbY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22510,7 +22510,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="439" aka="AAAAAAAAAbc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22558,7 +22558,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="440" aka="AAAAAAAAAbg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22606,7 +22606,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="441" aka="AAAAAAAAAbk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22654,7 +22654,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="442" aka="AAAAAAAAAbo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22702,7 +22702,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="443" aka="AAAAAAAAAbs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22750,7 +22750,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="444" aka="AAAAAAAAAbw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22798,7 +22798,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="445" aka="AAAAAAAAAb0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22846,7 +22846,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="446" aka="AAAAAAAAAb4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22894,7 +22894,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="447" aka="AAAAAAAAAb8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22942,7 +22942,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="448" aka="AAAAAAAAAcA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22990,7 +22990,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="449" aka="AAAAAAAAAcE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23038,7 +23038,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="450" aka="AAAAAAAAAcI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23086,7 +23086,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="451" aka="AAAAAAAAAcM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23150,7 +23150,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="452" aka="AAAAAAAAAcQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23198,7 +23198,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="453" aka="AAAAAAAAAcU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23246,7 +23246,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="454" aka="AAAAAAAAAcY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23294,7 +23294,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="455" aka="AAAAAAAAAcc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23342,7 +23342,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="456" aka="AAAAAAAAAcg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23390,7 +23390,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="457" aka="AAAAAAAAAck=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23511,7 +23511,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="459" aka="AAAAAAAAAcs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23563,7 +23563,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="460" aka="AAAAAAAAAcw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23611,7 +23611,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="461" aka="AAAAAAAAAc0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23659,7 +23659,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="462" aka="AAAAAAAAAc4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23707,7 +23707,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="463" aka="AAAAAAAAAc8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23755,7 +23755,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="464" aka="AAAAAAAAAdA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23803,7 +23803,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="465" aka="AAAAAAAAAdE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23851,7 +23851,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="466" aka="AAAAAAAAAdI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23899,7 +23899,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="467" aka="AAAAAAAAAdM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23947,7 +23947,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="468" aka="AAAAAAAAAdQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -23995,7 +23995,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="469" aka="AAAAAAAAAdU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24043,7 +24043,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="470" aka="AAAAAAAAAdY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24091,7 +24091,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="471" aka="AAAAAAAAAdc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24139,7 +24139,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="472" aka="AAAAAAAAAdg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24187,7 +24187,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="473" aka="AAAAAAAAAdk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24235,7 +24235,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="474" aka="AAAAAAAAAdo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24283,7 +24283,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="475" aka="AAAAAAAAAds=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24331,7 +24331,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="476" aka="AAAAAAAAAdw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24379,7 +24379,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="477" aka="AAAAAAAAAd0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24427,7 +24427,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="478" aka="AAAAAAAAAd4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24491,7 +24491,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="479" aka="AAAAAAAAAd8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24539,7 +24539,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="480" aka="AAAAAAAAAeA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24587,7 +24587,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="481" aka="AAAAAAAAAeE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24635,7 +24635,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="482" aka="AAAAAAAAAeI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24683,7 +24683,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="483" aka="AAAAAAAAAeM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24731,7 +24731,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="484" aka="AAAAAAAAAeQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24779,7 +24779,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="485" aka="AAAAAAAAAeU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24827,7 +24827,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="486" aka="AAAAAAAAAeY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24875,7 +24875,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="487" aka="AAAAAAAAAec=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -24956,7 +24956,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="489" aka="AAAAAAAAAek=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25004,7 +25004,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="490" aka="AAAAAAAAAeo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25056,7 +25056,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="491" aka="AAAAAAAAAes=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25104,7 +25104,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="492" aka="AAAAAAAAAew=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25152,7 +25152,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="493" aka="AAAAAAAAAe0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25200,7 +25200,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="494" aka="AAAAAAAAAe4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25248,7 +25248,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="495" aka="AAAAAAAAAe8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25312,7 +25312,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="496" aka="AAAAAAAAAfA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25360,7 +25360,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="497" aka="AAAAAAAAAfE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25458,7 +25458,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="500" aka="AAAAAAAAAfQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25506,7 +25506,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="501" aka="AAAAAAAAAfU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25558,7 +25558,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="502" aka="AAAAAAAAAfY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25606,7 +25606,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="503" aka="AAAAAAAAAfc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25654,7 +25654,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="504" aka="AAAAAAAAAfg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25702,7 +25702,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="505" aka="AAAAAAAAAfk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25750,7 +25750,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="506" aka="AAAAAAAAAfo=">
     <pickle>
-      <global name="WebServiceRequestGroup" module="erp5.document.WebServiceRequestGroup"/>
+      <global name="WebServiceRequestGroup" module="erp5.component.document.WebServiceRequestGroup"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25798,7 +25798,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="507" aka="AAAAAAAAAfs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25846,7 +25846,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="508" aka="AAAAAAAAAfw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25919,7 +25919,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="510" aka="AAAAAAAAAf4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -25971,7 +25971,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="511" aka="AAAAAAAAAf8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26019,7 +26019,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="512" aka="AAAAAAAAAgA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26067,7 +26067,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="513" aka="AAAAAAAAAgE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26137,7 +26137,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="514" aka="AAAAAAAAAgI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26210,7 +26210,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="516" aka="AAAAAAAAAgQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26262,7 +26262,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="517" aka="AAAAAAAAAgU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26310,7 +26310,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="518" aka="AAAAAAAAAgY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26358,7 +26358,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="519" aka="AAAAAAAAAgc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -26422,7 +26422,7 @@ args = [], kw = {\'data\': \'<ns0:query>  <ns0:querystring>    SELECT      Id, T
   </record>
   <record id="520" aka="AAAAAAAAAgg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_tiosafe_salesforce/PathTemplateItem/portal_integrations/salesforce/person_module/getContactAddressList.xml b/bt5/erp5_tiosafe_salesforce/PathTemplateItem/portal_integrations/salesforce/person_module/getContactAddressList.xml
index de096786b5..8977e73708 100644
--- a/bt5/erp5_tiosafe_salesforce/PathTemplateItem/portal_integrations/salesforce/person_module/getContactAddressList.xml
+++ b/bt5/erp5_tiosafe_salesforce/PathTemplateItem/portal_integrations/salesforce/person_module/getContactAddressList.xml
@@ -1291,7 +1291,7 @@
   </record>
   <record id="20" aka="AAAAAAAAABQ=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2059,7 +2059,7 @@
   </record>
   <record id="51" aka="AAAAAAAAADM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2111,7 +2111,7 @@
   </record>
   <record id="52" aka="AAAAAAAAADQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2159,7 +2159,7 @@
   </record>
   <record id="53" aka="AAAAAAAAADU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2207,7 +2207,7 @@
   </record>
   <record id="54" aka="AAAAAAAAADY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2345,7 +2345,7 @@
   </record>
   <record id="55" aka="AAAAAAAAADc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2418,7 +2418,7 @@
   </record>
   <record id="57" aka="AAAAAAAAADk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2470,7 +2470,7 @@
   </record>
   <record id="58" aka="AAAAAAAAADo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2518,7 +2518,7 @@
   </record>
   <record id="59" aka="AAAAAAAAADs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2566,7 +2566,7 @@
   </record>
   <record id="60" aka="AAAAAAAAADw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2704,7 +2704,7 @@
   </record>
   <record id="61" aka="AAAAAAAAAD0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2807,7 +2807,7 @@
   </record>
   <record id="63" aka="AAAAAAAAAD8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2859,7 +2859,7 @@
   </record>
   <record id="64" aka="AAAAAAAAAEA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2907,7 +2907,7 @@
   </record>
   <record id="65" aka="AAAAAAAAAEE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2955,7 +2955,7 @@
   </record>
   <record id="66" aka="AAAAAAAAAEI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3003,7 +3003,7 @@
   </record>
   <record id="67" aka="AAAAAAAAAEM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3051,7 +3051,7 @@
   </record>
   <record id="68" aka="AAAAAAAAAEQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3099,7 +3099,7 @@
   </record>
   <record id="69" aka="AAAAAAAAAEU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3147,7 +3147,7 @@
   </record>
   <record id="70" aka="AAAAAAAAAEY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3195,7 +3195,7 @@
   </record>
   <record id="71" aka="AAAAAAAAAEc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3243,7 +3243,7 @@
   </record>
   <record id="72" aka="AAAAAAAAAEg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3291,7 +3291,7 @@
   </record>
   <record id="73" aka="AAAAAAAAAEk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3339,7 +3339,7 @@
   </record>
   <record id="74" aka="AAAAAAAAAEo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3387,7 +3387,7 @@
   </record>
   <record id="75" aka="AAAAAAAAAEs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3435,7 +3435,7 @@
   </record>
   <record id="76" aka="AAAAAAAAAEw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3499,7 +3499,7 @@
   </record>
   <record id="77" aka="AAAAAAAAAE0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3547,7 +3547,7 @@
   </record>
   <record id="78" aka="AAAAAAAAAE4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3595,7 +3595,7 @@
   </record>
   <record id="79" aka="AAAAAAAAAE8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3643,7 +3643,7 @@
   </record>
   <record id="80" aka="AAAAAAAAAFA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3691,7 +3691,7 @@
   </record>
   <record id="81" aka="AAAAAAAAAFE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3739,7 +3739,7 @@
   </record>
   <record id="82" aka="AAAAAAAAAFI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3860,7 +3860,7 @@
   </record>
   <record id="84" aka="AAAAAAAAAFQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3912,7 +3912,7 @@
   </record>
   <record id="85" aka="AAAAAAAAAFU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3960,7 +3960,7 @@
   </record>
   <record id="86" aka="AAAAAAAAAFY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4008,7 +4008,7 @@
   </record>
   <record id="87" aka="AAAAAAAAAFc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4056,7 +4056,7 @@
   </record>
   <record id="88" aka="AAAAAAAAAFg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4104,7 +4104,7 @@
   </record>
   <record id="89" aka="AAAAAAAAAFk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4152,7 +4152,7 @@
   </record>
   <record id="90" aka="AAAAAAAAAFo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4200,7 +4200,7 @@
   </record>
   <record id="91" aka="AAAAAAAAAFs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4248,7 +4248,7 @@
   </record>
   <record id="92" aka="AAAAAAAAAFw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4296,7 +4296,7 @@
   </record>
   <record id="93" aka="AAAAAAAAAF0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4344,7 +4344,7 @@
   </record>
   <record id="94" aka="AAAAAAAAAF4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4392,7 +4392,7 @@
   </record>
   <record id="95" aka="AAAAAAAAAF8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4440,7 +4440,7 @@
   </record>
   <record id="96" aka="AAAAAAAAAGA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4488,7 +4488,7 @@
   </record>
   <record id="97" aka="AAAAAAAAAGE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4536,7 +4536,7 @@
   </record>
   <record id="98" aka="AAAAAAAAAGI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4584,7 +4584,7 @@
   </record>
   <record id="99" aka="AAAAAAAAAGM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4632,7 +4632,7 @@
   </record>
   <record id="100" aka="AAAAAAAAAGQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4680,7 +4680,7 @@
   </record>
   <record id="101" aka="AAAAAAAAAGU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4728,7 +4728,7 @@
   </record>
   <record id="102" aka="AAAAAAAAAGY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4776,7 +4776,7 @@
   </record>
   <record id="103" aka="AAAAAAAAAGc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4840,7 +4840,7 @@
   </record>
   <record id="104" aka="AAAAAAAAAGg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4888,7 +4888,7 @@
   </record>
   <record id="105" aka="AAAAAAAAAGk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4936,7 +4936,7 @@
   </record>
   <record id="106" aka="AAAAAAAAAGo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4984,7 +4984,7 @@
   </record>
   <record id="107" aka="AAAAAAAAAGs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5032,7 +5032,7 @@
   </record>
   <record id="108" aka="AAAAAAAAAGw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5080,7 +5080,7 @@
   </record>
   <record id="109" aka="AAAAAAAAAG0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5128,7 +5128,7 @@
   </record>
   <record id="110" aka="AAAAAAAAAG4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5176,7 +5176,7 @@
   </record>
   <record id="111" aka="AAAAAAAAAG8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5224,7 +5224,7 @@
   </record>
   <record id="112" aka="AAAAAAAAAHA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5305,7 +5305,7 @@
   </record>
   <record id="114" aka="AAAAAAAAAHI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5353,7 +5353,7 @@
   </record>
   <record id="115" aka="AAAAAAAAAHM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5405,7 +5405,7 @@
   </record>
   <record id="116" aka="AAAAAAAAAHQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5453,7 +5453,7 @@
   </record>
   <record id="117" aka="AAAAAAAAAHU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5501,7 +5501,7 @@
   </record>
   <record id="118" aka="AAAAAAAAAHY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5549,7 +5549,7 @@
   </record>
   <record id="119" aka="AAAAAAAAAHc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5597,7 +5597,7 @@
   </record>
   <record id="120" aka="AAAAAAAAAHg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5661,7 +5661,7 @@
   </record>
   <record id="121" aka="AAAAAAAAAHk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5709,7 +5709,7 @@
   </record>
   <record id="122" aka="AAAAAAAAAHo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6100,7 +6100,7 @@
   </record>
   <record id="132" aka="AAAAAAAAAIQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6148,7 +6148,7 @@
   </record>
   <record id="133" aka="AAAAAAAAAIU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6200,7 +6200,7 @@
   </record>
   <record id="134" aka="AAAAAAAAAIY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6248,7 +6248,7 @@
   </record>
   <record id="135" aka="AAAAAAAAAIc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6296,7 +6296,7 @@
   </record>
   <record id="136" aka="AAAAAAAAAIg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6344,7 +6344,7 @@
   </record>
   <record id="137" aka="AAAAAAAAAIk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6392,7 +6392,7 @@
   </record>
   <record id="138" aka="AAAAAAAAAIo=">
     <pickle>
-      <global name="WebServiceRequestGroup" module="erp5.document.WebServiceRequestGroup"/>
+      <global name="WebServiceRequestGroup" module="erp5.component.document.WebServiceRequestGroup"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6441,7 +6441,7 @@
   </record>
   <record id="139" aka="AAAAAAAAAIs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6583,7 +6583,7 @@
   </record>
   <record id="140" aka="AAAAAAAAAIw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6631,7 +6631,7 @@
   </record>
   <record id="141" aka="AAAAAAAAAI0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6704,7 +6704,7 @@
   </record>
   <record id="143" aka="AAAAAAAAAI8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6756,7 +6756,7 @@
   </record>
   <record id="144" aka="AAAAAAAAAJA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6804,7 +6804,7 @@
   </record>
   <record id="145" aka="AAAAAAAAAJE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6852,7 +6852,7 @@
   </record>
   <record id="146" aka="AAAAAAAAAJI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6922,7 +6922,7 @@
   </record>
   <record id="147" aka="AAAAAAAAAJM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6995,7 +6995,7 @@
   </record>
   <record id="149" aka="AAAAAAAAAJU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7047,7 +7047,7 @@
   </record>
   <record id="150" aka="AAAAAAAAAJY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7095,7 +7095,7 @@
   </record>
   <record id="151" aka="AAAAAAAAAJc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7143,7 +7143,7 @@
   </record>
   <record id="152" aka="AAAAAAAAAJg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7283,7 +7283,7 @@
   </record>
   <record id="153" aka="AAAAAAAAAJk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8186,7 +8186,7 @@
   </record>
   <record id="169" aka="AAAAAAAAAKk=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8857,7 +8857,7 @@
   </record>
   <record id="197" aka="AAAAAAAAAMU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8909,7 +8909,7 @@
   </record>
   <record id="198" aka="AAAAAAAAAMY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8957,7 +8957,7 @@
   </record>
   <record id="199" aka="AAAAAAAAAMc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9005,7 +9005,7 @@
   </record>
   <record id="200" aka="AAAAAAAAAMg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9069,7 +9069,7 @@
   </record>
   <record id="201" aka="AAAAAAAAAMk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9142,7 +9142,7 @@
   </record>
   <record id="203" aka="AAAAAAAAAMs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9194,7 +9194,7 @@
   </record>
   <record id="204" aka="AAAAAAAAAMw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9242,7 +9242,7 @@
   </record>
   <record id="205" aka="AAAAAAAAAM0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9290,7 +9290,7 @@
   </record>
   <record id="206" aka="AAAAAAAAAM4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9354,7 +9354,7 @@
   </record>
   <record id="207" aka="AAAAAAAAAM8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9457,7 +9457,7 @@
   </record>
   <record id="209" aka="AAAAAAAAANE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9509,7 +9509,7 @@
   </record>
   <record id="210" aka="AAAAAAAAANI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9557,7 +9557,7 @@
   </record>
   <record id="211" aka="AAAAAAAAANM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9605,7 +9605,7 @@
   </record>
   <record id="212" aka="AAAAAAAAANQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9653,7 +9653,7 @@
   </record>
   <record id="213" aka="AAAAAAAAANU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9701,7 +9701,7 @@
   </record>
   <record id="214" aka="AAAAAAAAANY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9749,7 +9749,7 @@
   </record>
   <record id="215" aka="AAAAAAAAANc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9797,7 +9797,7 @@
   </record>
   <record id="216" aka="AAAAAAAAANg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9845,7 +9845,7 @@
   </record>
   <record id="217" aka="AAAAAAAAANk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9893,7 +9893,7 @@
   </record>
   <record id="218" aka="AAAAAAAAANo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9941,7 +9941,7 @@
   </record>
   <record id="219" aka="AAAAAAAAANs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9989,7 +9989,7 @@
   </record>
   <record id="220" aka="AAAAAAAAANw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10037,7 +10037,7 @@
   </record>
   <record id="221" aka="AAAAAAAAAN0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10085,7 +10085,7 @@
   </record>
   <record id="222" aka="AAAAAAAAAN4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10149,7 +10149,7 @@
   </record>
   <record id="223" aka="AAAAAAAAAN8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10197,7 +10197,7 @@
   </record>
   <record id="224" aka="AAAAAAAAAOA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10245,7 +10245,7 @@
   </record>
   <record id="225" aka="AAAAAAAAAOE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10293,7 +10293,7 @@
   </record>
   <record id="226" aka="AAAAAAAAAOI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10341,7 +10341,7 @@
   </record>
   <record id="227" aka="AAAAAAAAAOM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10389,7 +10389,7 @@
   </record>
   <record id="228" aka="AAAAAAAAAOQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10510,7 +10510,7 @@
   </record>
   <record id="230" aka="AAAAAAAAAOY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10562,7 +10562,7 @@
   </record>
   <record id="231" aka="AAAAAAAAAOc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10610,7 +10610,7 @@
   </record>
   <record id="232" aka="AAAAAAAAAOg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10658,7 +10658,7 @@
   </record>
   <record id="233" aka="AAAAAAAAAOk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10706,7 +10706,7 @@
   </record>
   <record id="234" aka="AAAAAAAAAOo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10754,7 +10754,7 @@
   </record>
   <record id="235" aka="AAAAAAAAAOs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10802,7 +10802,7 @@
   </record>
   <record id="236" aka="AAAAAAAAAOw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10850,7 +10850,7 @@
   </record>
   <record id="237" aka="AAAAAAAAAO0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10898,7 +10898,7 @@
   </record>
   <record id="238" aka="AAAAAAAAAO4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10946,7 +10946,7 @@
   </record>
   <record id="239" aka="AAAAAAAAAO8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10994,7 +10994,7 @@
   </record>
   <record id="240" aka="AAAAAAAAAPA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11042,7 +11042,7 @@
   </record>
   <record id="241" aka="AAAAAAAAAPE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11090,7 +11090,7 @@
   </record>
   <record id="242" aka="AAAAAAAAAPI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11138,7 +11138,7 @@
   </record>
   <record id="243" aka="AAAAAAAAAPM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11186,7 +11186,7 @@
   </record>
   <record id="244" aka="AAAAAAAAAPQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11234,7 +11234,7 @@
   </record>
   <record id="245" aka="AAAAAAAAAPU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11282,7 +11282,7 @@
   </record>
   <record id="246" aka="AAAAAAAAAPY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11330,7 +11330,7 @@
   </record>
   <record id="247" aka="AAAAAAAAAPc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11378,7 +11378,7 @@
   </record>
   <record id="248" aka="AAAAAAAAAPg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11426,7 +11426,7 @@
   </record>
   <record id="249" aka="AAAAAAAAAPk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11490,7 +11490,7 @@
   </record>
   <record id="250" aka="AAAAAAAAAPo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11538,7 +11538,7 @@
   </record>
   <record id="251" aka="AAAAAAAAAPs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11586,7 +11586,7 @@
   </record>
   <record id="252" aka="AAAAAAAAAPw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11634,7 +11634,7 @@
   </record>
   <record id="253" aka="AAAAAAAAAP0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11682,7 +11682,7 @@
   </record>
   <record id="254" aka="AAAAAAAAAP4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11730,7 +11730,7 @@
   </record>
   <record id="255" aka="AAAAAAAAAP8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11778,7 +11778,7 @@
   </record>
   <record id="256" aka="AAAAAAAAAQA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11826,7 +11826,7 @@
   </record>
   <record id="257" aka="AAAAAAAAAQE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11874,7 +11874,7 @@
   </record>
   <record id="258" aka="AAAAAAAAAQI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11955,7 +11955,7 @@
   </record>
   <record id="260" aka="AAAAAAAAAQQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12003,7 +12003,7 @@
   </record>
   <record id="261" aka="AAAAAAAAAQU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12055,7 +12055,7 @@
   </record>
   <record id="262" aka="AAAAAAAAAQY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12103,7 +12103,7 @@
   </record>
   <record id="263" aka="AAAAAAAAAQc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12151,7 +12151,7 @@
   </record>
   <record id="264" aka="AAAAAAAAAQg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12199,7 +12199,7 @@
   </record>
   <record id="265" aka="AAAAAAAAAQk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12247,7 +12247,7 @@
   </record>
   <record id="266" aka="AAAAAAAAAQo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12311,7 +12311,7 @@
   </record>
   <record id="267" aka="AAAAAAAAAQs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12359,7 +12359,7 @@
   </record>
   <record id="268" aka="AAAAAAAAAQw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12457,7 +12457,7 @@
   </record>
   <record id="271" aka="AAAAAAAAAQ8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12505,7 +12505,7 @@
   </record>
   <record id="272" aka="AAAAAAAAARA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12557,7 +12557,7 @@
   </record>
   <record id="273" aka="AAAAAAAAARE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12605,7 +12605,7 @@
   </record>
   <record id="274" aka="AAAAAAAAARI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12653,7 +12653,7 @@
   </record>
   <record id="275" aka="AAAAAAAAARM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12701,7 +12701,7 @@
   </record>
   <record id="276" aka="AAAAAAAAARQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12749,7 +12749,7 @@
   </record>
   <record id="277" aka="AAAAAAAAARU=">
     <pickle>
-      <global name="WebServiceRequestGroup" module="erp5.document.WebServiceRequestGroup"/>
+      <global name="WebServiceRequestGroup" module="erp5.component.document.WebServiceRequestGroup"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12797,7 +12797,7 @@
   </record>
   <record id="278" aka="AAAAAAAAARY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12845,7 +12845,7 @@
   </record>
   <record id="279" aka="AAAAAAAAARc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12918,7 +12918,7 @@
   </record>
   <record id="281" aka="AAAAAAAAARk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12970,7 +12970,7 @@
   </record>
   <record id="282" aka="AAAAAAAAARo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13018,7 +13018,7 @@
   </record>
   <record id="283" aka="AAAAAAAAARs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13066,7 +13066,7 @@
   </record>
   <record id="284" aka="AAAAAAAAARw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13136,7 +13136,7 @@
   </record>
   <record id="285" aka="AAAAAAAAAR0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13209,7 +13209,7 @@
   </record>
   <record id="287" aka="AAAAAAAAAR8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13261,7 +13261,7 @@
   </record>
   <record id="288" aka="AAAAAAAAASA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13309,7 +13309,7 @@
   </record>
   <record id="289" aka="AAAAAAAAASE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13357,7 +13357,7 @@
   </record>
   <record id="290" aka="AAAAAAAAASI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13421,7 +13421,7 @@
   </record>
   <record id="291" aka="AAAAAAAAASM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_tiosafe_salesforce/bt/change_log b/bt5/erp5_tiosafe_salesforce/bt/change_log
index f4ad94796d..c682ff65ef 100644
--- a/bt5/erp5_tiosafe_salesforce/bt/change_log
+++ b/bt5/erp5_tiosafe_salesforce/bt/change_log
@@ -1,2 +1,5 @@
+2013-09-02 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 * 2011-10-06 Aurel
 - Initial version
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_salesforce/bt/revision b/bt5/erp5_tiosafe_salesforce/bt/revision
index 56a6051ca2..d8263ee986 100644
--- a/bt5/erp5_tiosafe_salesforce/bt/revision
+++ b/bt5/erp5_tiosafe_salesforce/bt/revision
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_ubercart/PathTemplateItem/portal_integrations/ubercart/person_module/createPerson.xml b/bt5/erp5_tiosafe_ubercart/PathTemplateItem/portal_integrations/ubercart/person_module/createPerson.xml
index 53ba1eb056..952f1c9a4d 100644
--- a/bt5/erp5_tiosafe_ubercart/PathTemplateItem/portal_integrations/ubercart/person_module/createPerson.xml
+++ b/bt5/erp5_tiosafe_ubercart/PathTemplateItem/portal_integrations/ubercart/person_module/createPerson.xml
@@ -533,7 +533,7 @@
   </record>
   <record id="13" aka="AAAAAAAAAA0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -599,7 +599,7 @@
   </record>
   <record id="14" aka="AAAAAAAAAA4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -816,7 +816,7 @@
   </record>
   <record id="17" aka="AAAAAAAAABE=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1472,7 +1472,7 @@
   </record>
   <record id="26" aka="AAAAAAAAABo=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3136,7 +3136,7 @@
   </record>
   <record id="83" aka="AAAAAAAAAFM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3268,7 +3268,7 @@
   </record>
   <record id="84" aka="AAAAAAAAAFQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3851,7 +3851,7 @@
   </record>
   <record id="97" aka="AAAAAAAAAGE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3980,7 +3980,7 @@
   </record>
   <record id="98" aka="AAAAAAAAAGI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5427,7 +5427,7 @@
   </record>
   <record id="129" aka="AAAAAAAAAIE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5946,7 +5946,7 @@
   </record>
   <record id="133" aka="AAAAAAAAAIU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6028,7 +6028,7 @@
   </record>
   <record id="134" aka="AAAAAAAAAIY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6587,7 +6587,7 @@
   </record>
   <record id="147" aka="AAAAAAAAAJM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6677,7 +6677,7 @@
   </record>
   <record id="148" aka="AAAAAAAAAJQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6761,7 +6761,7 @@ INSERT INTO term_data (vid, name) VALUES (1, \'DIAGNE\')\n
   </record>
   <record id="149" aka="AAAAAAAAAJU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6877,7 +6877,7 @@ INSERT INTO term_data (vid, name) VALUES (1, \'DIAGNE\')\n
   </record>
   <record id="150" aka="AAAAAAAAAJY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6986,7 +6986,7 @@ INSERT INTO term_data (vid, name) VALUES (1, \'DIAGNE\')\n
   </record>
   <record id="151" aka="AAAAAAAAAJc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7624,7 +7624,7 @@ INSERT INTO term_data (vid, name) VALUES (1, \'DIAGNE\')\n
   </record>
   <record id="164" aka="AAAAAAAAAKQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7679,7 +7679,7 @@ INSERT INTO term_data (vid, name) VALUES (1, \'DIAGNE\')\n
   </record>
   <record id="165" aka="AAAAAAAAAKU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7761,7 +7761,7 @@ http://10.8.1.18/drupal/modules/tiosafe_connector/deleteSaleOrder.php?id=4&
   </record>
   <record id="166" aka="AAAAAAAAAKY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7893,7 +7893,7 @@ http://10.8.1.18/drupal/modules/tiosafe_connector/deleteSaleOrder.php?id=4&
   </record>
   <record id="167" aka="AAAAAAAAAKc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8000,7 +8000,7 @@ http://10.8.1.18/drupal/modules/tiosafe_connector/deleteSaleOrder.php?id=4&
   </record>
   <record id="168" aka="AAAAAAAAAKg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8105,7 +8105,7 @@ http://10.8.1.18/drupal/modules/tiosafe_connector/deleteSaleOrder.php?id=4&
   </record>
   <record id="169" aka="AAAAAAAAAKk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_tiosafe_ubercart/bt/change_log b/bt5/erp5_tiosafe_ubercart/bt/change_log
index 6f577deb50..fdd9d78c80 100644
--- a/bt5/erp5_tiosafe_ubercart/bt/change_log
+++ b/bt5/erp5_tiosafe_ubercart/bt/change_log
@@ -1,2 +1,5 @@
+2013-09-02 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-04-20 mayoro
 - initial version
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_ubercart/bt/revision b/bt5/erp5_tiosafe_ubercart/bt/revision
index 1758dddcce..dc7b54ad01 100644
--- a/bt5/erp5_tiosafe_ubercart/bt/revision
+++ b/bt5/erp5_tiosafe_ubercart/bt/revision
@@ -1 +1 @@
-32
\ No newline at end of file
+33
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_virtuemart/PathTemplateItem/portal_integrations/virtuemart/person_module/deletePerson.xml b/bt5/erp5_tiosafe_virtuemart/PathTemplateItem/portal_integrations/virtuemart/person_module/deletePerson.xml
index 4285c0adee..3d5eceb29c 100644
--- a/bt5/erp5_tiosafe_virtuemart/PathTemplateItem/portal_integrations/virtuemart/person_module/deletePerson.xml
+++ b/bt5/erp5_tiosafe_virtuemart/PathTemplateItem/portal_integrations/virtuemart/person_module/deletePerson.xml
@@ -667,7 +667,7 @@
   </record>
   <record id="15" aka="AAAAAAAAAA8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -737,7 +737,7 @@
   </record>
   <record id="16" aka="AAAAAAAAABA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1277,7 +1277,7 @@
   </record>
   <record id="24" aka="AAAAAAAAABg=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3053,7 +3053,7 @@
   </record>
   <record id="82" aka="AAAAAAAAAFI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3144,7 +3144,7 @@ INSERT INTO gvi_users\n
   </record>
   <record id="83" aka="AAAAAAAAAFM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3754,7 +3754,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="98" aka="AAAAAAAAAGI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3881,7 +3881,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="99" aka="AAAAAAAAAGM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4041,7 +4041,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="101" aka="AAAAAAAAAGU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4172,7 +4172,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="102" aka="AAAAAAAAAGY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4769,7 +4769,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="115" aka="AAAAAAAAAHM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4899,7 +4899,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="116" aka="AAAAAAAAAHQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5746,7 +5746,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="132" aka="AAAAAAAAAIQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5837,7 +5837,7 @@ INSERT INTO gvi_users\n
   </record>
   <record id="133" aka="AAAAAAAAAIU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5919,7 +5919,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="134" aka="AAAAAAAAAIY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5983,7 +5983,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="135" aka="AAAAAAAAAIc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6149,7 +6149,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="136" aka="AAAAAAAAAIg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6248,7 +6248,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="137" aka="AAAAAAAAAIk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6392,7 +6392,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="138" aka="AAAAAAAAAIo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6476,7 +6476,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="139" aka="AAAAAAAAAIs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6993,7 +6993,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="150" aka="AAAAAAAAAJY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7076,7 +7076,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="151" aka="AAAAAAAAAJc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7158,7 +7158,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="152" aka="AAAAAAAAAJg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7408,7 +7408,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="153" aka="AAAAAAAAAJk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7516,7 +7516,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="154" aka="AAAAAAAAAJo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8665,7 +8665,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="177" aka="AAAAAAAAALE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8709,7 +8709,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="178" aka="AAAAAAAAALI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8815,7 +8815,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="179" aka="AAAAAAAAALM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8923,7 +8923,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="180" aka="AAAAAAAAALQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9004,7 +9004,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="181" aka="AAAAAAAAALU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_tiosafe_virtuemart/PathTemplateItem/portal_integrations/virtuemart/person_module/deletePersonAddress.xml b/bt5/erp5_tiosafe_virtuemart/PathTemplateItem/portal_integrations/virtuemart/person_module/deletePersonAddress.xml
index 8d9b95bda3..b6825a8f1e 100644
--- a/bt5/erp5_tiosafe_virtuemart/PathTemplateItem/portal_integrations/virtuemart/person_module/deletePersonAddress.xml
+++ b/bt5/erp5_tiosafe_virtuemart/PathTemplateItem/portal_integrations/virtuemart/person_module/deletePersonAddress.xml
@@ -642,7 +642,7 @@
   </record>
   <record id="15" aka="AAAAAAAAAA8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -712,7 +712,7 @@
   </record>
   <record id="16" aka="AAAAAAAAABA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1252,7 +1252,7 @@
   </record>
   <record id="24" aka="AAAAAAAAABg=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3032,7 +3032,7 @@
   </record>
   <record id="82" aka="AAAAAAAAAFI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3123,7 +3123,7 @@ INSERT INTO gvi_users\n
   </record>
   <record id="83" aka="AAAAAAAAAFM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3205,7 +3205,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="84" aka="AAAAAAAAAFQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3817,7 +3817,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="99" aka="AAAAAAAAAGM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3944,7 +3944,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="100" aka="AAAAAAAAAGQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4104,7 +4104,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="102" aka="AAAAAAAAAGY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4235,7 +4235,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="103" aka="AAAAAAAAAGc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4832,7 +4832,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="116" aka="AAAAAAAAAHQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4962,7 +4962,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="117" aka="AAAAAAAAAHU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5809,7 +5809,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="133" aka="AAAAAAAAAIU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5900,7 +5900,7 @@ INSERT INTO gvi_users\n
   </record>
   <record id="134" aka="AAAAAAAAAIY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5982,7 +5982,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="135" aka="AAAAAAAAAIc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6066,7 +6066,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="136" aka="AAAAAAAAAIg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6232,7 +6232,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="137" aka="AAAAAAAAAIk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6331,7 +6331,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="138" aka="AAAAAAAAAIo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6475,7 +6475,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="139" aka="AAAAAAAAAIs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6559,7 +6559,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="140" aka="AAAAAAAAAIw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7076,7 +7076,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="151" aka="AAAAAAAAAJc=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7159,7 +7159,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="152" aka="AAAAAAAAAJg=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7241,7 +7241,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="153" aka="AAAAAAAAAJk=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7491,7 +7491,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="154" aka="AAAAAAAAAJo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7599,7 +7599,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="155" aka="AAAAAAAAAJs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8748,7 +8748,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="178" aka="AAAAAAAAALI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8792,7 +8792,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="179" aka="AAAAAAAAALM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8898,7 +8898,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="180" aka="AAAAAAAAALQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9006,7 +9006,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="181" aka="AAAAAAAAALU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9087,7 +9087,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="182" aka="AAAAAAAAALY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11125,7 +11125,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="234" aka="AAAAAAAAAOo=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11195,7 +11195,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="235" aka="AAAAAAAAAOs=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11735,7 +11735,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="243" aka="AAAAAAAAAPM=">
     <pickle>
-      <global name="WebServiceConnector" module="erp5.document.WebServiceConnector"/>
+      <global name="WebServiceConnector" module="erp5.component.document.WebServiceConnector"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13511,7 +13511,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="301" aka="AAAAAAAAAS0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13602,7 +13602,7 @@ INSERT INTO gvi_users\n
   </record>
   <record id="302" aka="AAAAAAAAAS4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14212,7 +14212,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="317" aka="AAAAAAAAAT0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14339,7 +14339,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="318" aka="AAAAAAAAAT4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14499,7 +14499,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="320" aka="AAAAAAAAAUA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14630,7 +14630,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="321" aka="AAAAAAAAAUE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15227,7 +15227,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="334" aka="AAAAAAAAAU4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15357,7 +15357,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="335" aka="AAAAAAAAAU8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16204,7 +16204,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="351" aka="AAAAAAAAAV8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16295,7 +16295,7 @@ INSERT INTO gvi_users\n
   </record>
   <record id="352" aka="AAAAAAAAAWA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16377,7 +16377,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="353" aka="AAAAAAAAAWE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16441,7 +16441,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="354" aka="AAAAAAAAAWI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16607,7 +16607,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="355" aka="AAAAAAAAAWM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16706,7 +16706,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="356" aka="AAAAAAAAAWQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16850,7 +16850,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="357" aka="AAAAAAAAAWU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16934,7 +16934,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="358" aka="AAAAAAAAAWY=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17451,7 +17451,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="369" aka="AAAAAAAAAXE=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17534,7 +17534,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="370" aka="AAAAAAAAAXI=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17616,7 +17616,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="371" aka="AAAAAAAAAXM=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17866,7 +17866,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="372" aka="AAAAAAAAAXQ=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17974,7 +17974,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="373" aka="AAAAAAAAAXU=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19123,7 +19123,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="396" aka="AAAAAAAAAYw=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19167,7 +19167,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="397" aka="AAAAAAAAAY0=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19273,7 +19273,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="398" aka="AAAAAAAAAY4=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19381,7 +19381,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="399" aka="AAAAAAAAAY8=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19462,7 +19462,7 @@ Query successfully processed!</string> </value>
   </record>
   <record id="400" aka="AAAAAAAAAZA=">
     <pickle>
-      <global name="WebServiceRequest" module="erp5.document.WebServiceRequest"/>
+      <global name="WebServiceRequest" module="erp5.component.document.WebServiceRequest"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_tiosafe_virtuemart/bt/change_log b/bt5/erp5_tiosafe_virtuemart/bt/change_log
index 3972f6dd2a..ca00ef4389 100644
--- a/bt5/erp5_tiosafe_virtuemart/bt/change_log
+++ b/bt5/erp5_tiosafe_virtuemart/bt/change_log
@@ -1,2 +1,5 @@
+2013-09-02 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-05-07 mohamadou
 - initial version
\ No newline at end of file
diff --git a/bt5/erp5_tiosafe_virtuemart/bt/revision b/bt5/erp5_tiosafe_virtuemart/bt/revision
index 72f523f36e..86ee83a4a2 100644
--- a/bt5/erp5_tiosafe_virtuemart/bt/revision
+++ b/bt5/erp5_tiosafe_virtuemart/bt/revision
@@ -1 +1 @@
-39
\ No newline at end of file
+40
\ No newline at end of file
diff --git a/bt5/erp5_trade/DocumentTemplateItem/DuplicateInventoryConstraint.py b/bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DuplicateInventoryConstraint.py
similarity index 100%
rename from bt5/erp5_trade/DocumentTemplateItem/DuplicateInventoryConstraint.py
rename to bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DuplicateInventoryConstraint.py
diff --git a/bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DuplicateInventoryConstraint.xml b/bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DuplicateInventoryConstraint.xml
new file mode 100644
index 0000000000..43a35423b2
--- /dev/null
+++ b/bt5/erp5_trade/DocumentTemplateItem/portal_components/document.erp5.DuplicateInventoryConstraint.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DuplicateInventoryConstraint</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.DuplicateInventoryConstraint</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844470.45</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log
index b6d77ec832..febceac9bf 100644
--- a/bt5/erp5_trade/bt/change_log
+++ b/bt5/erp5_trade/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2013-05-28 arnaud.fontaine
 * Fix incorrect change of my_view_mode_quantity ProxyField which must point to Base_viewFieldLibrary/my_view_mode_quantity so that figure CSS class is applied (9fcbe9c).
 
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 59be0e4979..a65c2ed38d 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-1170
\ No newline at end of file
+1171
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/template_document_id_list b/bt5/erp5_trade/bt/template_document_id_list
index 5398439256..f27d0dfcd6 100644
--- a/bt5/erp5_trade/bt/template_document_id_list
+++ b/bt5/erp5_trade/bt/template_document_id_list
@@ -1 +1 @@
-DuplicateInventoryConstraint
\ No newline at end of file
+document.erp5.DuplicateInventoryConstraint
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_trade/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..2fb3a54dac
--- /dev/null
+++ b/bt5/erp5_trade/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/document.erp5.DuplicateInventoryConstraint
\ No newline at end of file
diff --git a/bt5/erp5_ui_test_core/ExtensionTemplateItem/ERP5Zuite.py b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.py
similarity index 100%
rename from bt5/erp5_ui_test_core/ExtensionTemplateItem/ERP5Zuite.py
rename to bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.py
diff --git a/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.xml b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.xml
new file mode 100644
index 0000000000..9e8e6ffa75
--- /dev/null
+++ b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ERP5Zuite</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ERP5Zuite</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844487.45</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_ui_test_core/ExtensionTemplateItem/MailHostUtils.py b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.MailHostUtils.py
similarity index 100%
rename from bt5/erp5_ui_test_core/ExtensionTemplateItem/MailHostUtils.py
rename to bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.MailHostUtils.py
diff --git a/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.MailHostUtils.xml b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.MailHostUtils.xml
new file mode 100644
index 0000000000..513512bc2c
--- /dev/null
+++ b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.MailHostUtils.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>MailHostUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.MailHostUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844487.45</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_ui_test_core/ExtensionTemplateItem/SeleniumTestUtils.py b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.SeleniumTestUtils.py
similarity index 100%
rename from bt5/erp5_ui_test_core/ExtensionTemplateItem/SeleniumTestUtils.py
rename to bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.SeleniumTestUtils.py
diff --git a/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.SeleniumTestUtils.xml b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.SeleniumTestUtils.xml
new file mode 100644
index 0000000000..ee389c14ff
--- /dev/null
+++ b/bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.SeleniumTestUtils.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>SeleniumTestUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.SeleniumTestUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844487.46</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_ui_test_core/bt/change_log b/bt5/erp5_ui_test_core/bt/change_log
index 872b1540fa..3057e39427 100644
--- a/bt5/erp5_ui_test_core/bt/change_log
+++ b/bt5/erp5_ui_test_core/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2013-04-05 arnaud.fontaine
 * Implement Extensions to be able to check whether a report has been generated.
 
diff --git a/bt5/erp5_ui_test_core/bt/revision b/bt5/erp5_ui_test_core/bt/revision
index 4b6f9c39e5..b44fe09a7a 100644
--- a/bt5/erp5_ui_test_core/bt/revision
+++ b/bt5/erp5_ui_test_core/bt/revision
@@ -1 +1 @@
-64
\ No newline at end of file
+65
\ No newline at end of file
diff --git a/bt5/erp5_ui_test_core/bt/template_extension_id_list b/bt5/erp5_ui_test_core/bt/template_extension_id_list
index 8cdc9a6862..0a6c5a2b13 100644
--- a/bt5/erp5_ui_test_core/bt/template_extension_id_list
+++ b/bt5/erp5_ui_test_core/bt/template_extension_id_list
@@ -1,3 +1,3 @@
-MailHostUtils
-SeleniumTestUtils
-ERP5Zuite
\ No newline at end of file
+extension.erp5.ERP5Zuite
+extension.erp5.MailHostUtils
+extension.erp5.SeleniumTestUtils
\ No newline at end of file
diff --git a/bt5/erp5_ui_test_core/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_ui_test_core/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..01176286f0
--- /dev/null
+++ b/bt5/erp5_ui_test_core/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,3 @@
+portal_components/extension.erp5.ERP5Zuite
+portal_components/extension.erp5.MailHostUtils
+portal_components/extension.erp5.SeleniumTestUtils
\ No newline at end of file
diff --git a/bt5/erp5_upgrader/ExtensionTemplateItem/ERP5UpgraderCompatibility.py b/bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderCompatibility.py
similarity index 100%
rename from bt5/erp5_upgrader/ExtensionTemplateItem/ERP5UpgraderCompatibility.py
rename to bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderCompatibility.py
diff --git a/bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderCompatibility.xml b/bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderCompatibility.xml
new file mode 100644
index 0000000000..0bee2c3dd6
--- /dev/null
+++ b/bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderCompatibility.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ERP5UpgraderCompatibility</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ERP5UpgraderCompatibility</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844666.57</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_upgrader/ExtensionTemplateItem/ERP5UpgraderUtils.py b/bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderUtils.py
similarity index 100%
rename from bt5/erp5_upgrader/ExtensionTemplateItem/ERP5UpgraderUtils.py
rename to bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderUtils.py
diff --git a/bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderUtils.xml b/bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderUtils.xml
new file mode 100644
index 0000000000..63bbebbcfa
--- /dev/null
+++ b/bt5/erp5_upgrader/ExtensionTemplateItem/portal_components/extension.erp5.ERP5UpgraderUtils.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ERP5UpgraderUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ERP5UpgraderUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844666.56</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py b/bt5/erp5_upgrader/TestTemplateItem/portal_components/test.erp5.testLiveUpgrader.py
similarity index 100%
rename from bt5/erp5_upgrader/TestTemplateItem/testLiveUpgrader.py
rename to bt5/erp5_upgrader/TestTemplateItem/portal_components/test.erp5.testLiveUpgrader.py
diff --git a/bt5/erp5_upgrader/TestTemplateItem/portal_components/test.erp5.testLiveUpgrader.xml b/bt5/erp5_upgrader/TestTemplateItem/portal_components/test.erp5.testLiveUpgrader.xml
new file mode 100644
index 0000000000..55842a69da
--- /dev/null
+++ b/bt5/erp5_upgrader/TestTemplateItem/portal_components/test.erp5.testLiveUpgrader.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testLiveUpgrader</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testLiveUpgrader</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844666.57</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_upgrader/bt/change_log b/bt5/erp5_upgrader/bt/change_log
index e57531a558..fc6c1b0fbb 100644
--- a/bt5/erp5_upgrader/bt/change_log
+++ b/bt5/erp5_upgrader/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2012-10-05 arnaud.fontaine
 * Allow to specify bt5 which are not going to be upgraded (meaningful for master data for example). 
 
diff --git a/bt5/erp5_upgrader/bt/revision b/bt5/erp5_upgrader/bt/revision
index 4af6ab79ff..316941dd7d 100644
--- a/bt5/erp5_upgrader/bt/revision
+++ b/bt5/erp5_upgrader/bt/revision
@@ -1 +1 @@
-598
\ No newline at end of file
+599
\ No newline at end of file
diff --git a/bt5/erp5_upgrader/bt/template_extension_id_list b/bt5/erp5_upgrader/bt/template_extension_id_list
index 9a86c5bc71..c5edd96204 100644
--- a/bt5/erp5_upgrader/bt/template_extension_id_list
+++ b/bt5/erp5_upgrader/bt/template_extension_id_list
@@ -1,2 +1,2 @@
-ERP5UpgraderUtils
-ERP5UpgraderCompatibility
\ No newline at end of file
+extension.erp5.ERP5UpgraderUtils
+extension.erp5.ERP5UpgraderCompatibility
\ No newline at end of file
diff --git a/bt5/erp5_upgrader/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_upgrader/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..5adc57fef5
--- /dev/null
+++ b/bt5/erp5_upgrader/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,3 @@
+portal_components/extension.erp5.ERP5UpgraderUtils
+portal_components/extension.erp5.ERP5UpgraderCompatibility
+portal_components/test.erp5.testLiveUpgrader
\ No newline at end of file
diff --git a/bt5/erp5_upgrader/bt/template_test_id_list b/bt5/erp5_upgrader/bt/template_test_id_list
index a18a42da4d..13579366a5 100644
--- a/bt5/erp5_upgrader/bt/template_test_id_list
+++ b/bt5/erp5_upgrader/bt/template_test_id_list
@@ -1 +1 @@
-testLiveUpgrader
\ No newline at end of file
+test.erp5.testLiveUpgrader
\ No newline at end of file
diff --git a/bt5/erp5_web_shacache/ExtensionTemplateItem/ShaCache.py b/bt5/erp5_web_shacache/ExtensionTemplateItem/portal_components/extension.erp5.ShaCache.py
similarity index 100%
rename from bt5/erp5_web_shacache/ExtensionTemplateItem/ShaCache.py
rename to bt5/erp5_web_shacache/ExtensionTemplateItem/portal_components/extension.erp5.ShaCache.py
diff --git a/bt5/erp5_web_shacache/ExtensionTemplateItem/portal_components/extension.erp5.ShaCache.xml b/bt5/erp5_web_shacache/ExtensionTemplateItem/portal_components/extension.erp5.ShaCache.xml
new file mode 100644
index 0000000000..d91d210b4c
--- /dev/null
+++ b/bt5/erp5_web_shacache/ExtensionTemplateItem/portal_components/extension.erp5.ShaCache.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ShaCache</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ShaCache</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844458.38</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_shacache/TestTemplateItem/ShaCacheMixin.py b/bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.ShaCacheMixin.py
similarity index 100%
rename from bt5/erp5_web_shacache/TestTemplateItem/ShaCacheMixin.py
rename to bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.ShaCacheMixin.py
diff --git a/bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.ShaCacheMixin.xml b/bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.ShaCacheMixin.xml
new file mode 100644
index 0000000000..265bcbce27
--- /dev/null
+++ b/bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.ShaCacheMixin.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ShaCacheMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.ShaCacheMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844458.39</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_shacache/TestTemplateItem/testShaCache.py b/bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.testShaCache.py
similarity index 100%
rename from bt5/erp5_web_shacache/TestTemplateItem/testShaCache.py
rename to bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.testShaCache.py
diff --git a/bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.testShaCache.xml b/bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.testShaCache.xml
new file mode 100644
index 0000000000..62a3aaecfa
--- /dev/null
+++ b/bt5/erp5_web_shacache/TestTemplateItem/portal_components/test.erp5.testShaCache.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testShaCache</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testShaCache</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844458.39</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_shacache/bt/change_log b/bt5/erp5_web_shacache/bt/change_log
index ed52a6820c..208844b6e6 100644
--- a/bt5/erp5_web_shacache/bt/change_log
+++ b/bt5/erp5_web_shacache/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-05-25 Lucas
 * Depends of erp5_data_set business template.
 
diff --git a/bt5/erp5_web_shacache/bt/revision b/bt5/erp5_web_shacache/bt/revision
index d1cbcfa540..832332893a 100644
--- a/bt5/erp5_web_shacache/bt/revision
+++ b/bt5/erp5_web_shacache/bt/revision
@@ -1 +1 @@
-66
\ No newline at end of file
+67
\ No newline at end of file
diff --git a/bt5/erp5_web_shacache/bt/template_extension_id_list b/bt5/erp5_web_shacache/bt/template_extension_id_list
index 6705d71007..8a4e77a1d0 100644
--- a/bt5/erp5_web_shacache/bt/template_extension_id_list
+++ b/bt5/erp5_web_shacache/bt/template_extension_id_list
@@ -1 +1 @@
-ShaCache
\ No newline at end of file
+extension.erp5.ShaCache
\ No newline at end of file
diff --git a/bt5/erp5_web_shacache/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_web_shacache/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..0bb403a482
--- /dev/null
+++ b/bt5/erp5_web_shacache/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,3 @@
+portal_components/extension.erp5.ShaCache
+portal_components/test.erp5.ShaCacheMixin
+portal_components/test.erp5.testShaCache
\ No newline at end of file
diff --git a/bt5/erp5_web_shacache/bt/template_test_id_list b/bt5/erp5_web_shacache/bt/template_test_id_list
index 7352cb6f25..d251f7dbce 100644
--- a/bt5/erp5_web_shacache/bt/template_test_id_list
+++ b/bt5/erp5_web_shacache/bt/template_test_id_list
@@ -1,2 +1,2 @@
-testShaCache
-ShaCacheMixin
\ No newline at end of file
+test.erp5.ShaCacheMixin
+test.erp5.testShaCache
\ No newline at end of file
diff --git a/bt5/erp5_web_shadir/DocumentTemplateItem/WebSite.py b/bt5/erp5_web_shadir/DocumentTemplateItem/portal_components/document.erp5.WebSite.py
similarity index 100%
rename from bt5/erp5_web_shadir/DocumentTemplateItem/WebSite.py
rename to bt5/erp5_web_shadir/DocumentTemplateItem/portal_components/document.erp5.WebSite.py
diff --git a/bt5/erp5_web_shadir/DocumentTemplateItem/portal_components/document.erp5.WebSite.xml b/bt5/erp5_web_shadir/DocumentTemplateItem/portal_components/document.erp5.WebSite.xml
new file mode 100644
index 0000000000..fba9e0c21c
--- /dev/null
+++ b/bt5/erp5_web_shadir/DocumentTemplateItem/portal_components/document.erp5.WebSite.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Document Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>WebSite</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.WebSite</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844502.86</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_shadir/ExtensionTemplateItem/ShaDir.py b/bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.py
similarity index 100%
rename from bt5/erp5_web_shadir/ExtensionTemplateItem/ShaDir.py
rename to bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.py
diff --git a/bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.xml b/bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.xml
new file mode 100644
index 0000000000..beef3c9ac4
--- /dev/null
+++ b/bt5/erp5_web_shadir/ExtensionTemplateItem/portal_components/extension.erp5.ShaDir.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ShaDir</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.ShaDir</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844502.87</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_shadir/TestTemplateItem/ShaDirMixin.py b/bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.ShaDirMixin.py
similarity index 100%
rename from bt5/erp5_web_shadir/TestTemplateItem/ShaDirMixin.py
rename to bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.ShaDirMixin.py
diff --git a/bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.ShaDirMixin.xml b/bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.ShaDirMixin.xml
new file mode 100644
index 0000000000..4d28338c02
--- /dev/null
+++ b/bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.ShaDirMixin.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ShaDirMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.ShaDirMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844502.88</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_shadir/TestTemplateItem/testShaDir.py b/bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.testShaDir.py
similarity index 100%
rename from bt5/erp5_web_shadir/TestTemplateItem/testShaDir.py
rename to bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.testShaDir.py
diff --git a/bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.testShaDir.xml b/bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.testShaDir.xml
new file mode 100644
index 0000000000..86e3af64c2
--- /dev/null
+++ b/bt5/erp5_web_shadir/TestTemplateItem/portal_components/test.erp5.testShaDir.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testShaDir</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testShaDir</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844502.87</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_shadir/bt/change_log b/bt5/erp5_web_shadir/bt/change_log
index 9f4663929f..d092c4b84d 100644
--- a/bt5/erp5_web_shadir/bt/change_log
+++ b/bt5/erp5_web_shadir/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-05-26 Lucas
 * Removed _setSuperSecurityManager, security must be defined.
 
diff --git a/bt5/erp5_web_shadir/bt/revision b/bt5/erp5_web_shadir/bt/revision
index e77a96349c..0aeb548544 100644
--- a/bt5/erp5_web_shadir/bt/revision
+++ b/bt5/erp5_web_shadir/bt/revision
@@ -1 +1 @@
-73
\ No newline at end of file
+74
\ No newline at end of file
diff --git a/bt5/erp5_web_shadir/bt/template_document_id_list b/bt5/erp5_web_shadir/bt/template_document_id_list
index 7b09a9ed54..122646c28f 100644
--- a/bt5/erp5_web_shadir/bt/template_document_id_list
+++ b/bt5/erp5_web_shadir/bt/template_document_id_list
@@ -1 +1 @@
-WebSite
\ No newline at end of file
+document.erp5.WebSite
\ No newline at end of file
diff --git a/bt5/erp5_web_shadir/bt/template_extension_id_list b/bt5/erp5_web_shadir/bt/template_extension_id_list
index ac522a01b3..dcb6a8b521 100644
--- a/bt5/erp5_web_shadir/bt/template_extension_id_list
+++ b/bt5/erp5_web_shadir/bt/template_extension_id_list
@@ -1 +1 @@
-ShaDir
\ No newline at end of file
+extension.erp5.ShaDir
\ No newline at end of file
diff --git a/bt5/erp5_web_shadir/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_web_shadir/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..d8fc87bf95
--- /dev/null
+++ b/bt5/erp5_web_shadir/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,4 @@
+portal_components/document.erp5.WebSite
+portal_components/extension.erp5.ShaDir
+portal_components/test.erp5.testShaDir
+portal_components/test.erp5.ShaDirMixin
\ No newline at end of file
diff --git a/bt5/erp5_web_shadir/bt/template_test_id_list b/bt5/erp5_web_shadir/bt/template_test_id_list
index e1b2b73d0a..1369e6d57f 100644
--- a/bt5/erp5_web_shadir/bt/template_test_id_list
+++ b/bt5/erp5_web_shadir/bt/template_test_id_list
@@ -1,2 +1,2 @@
-ShaDirMixin
-testShaDir
\ No newline at end of file
+test.erp5.testShaDir
+test.erp5.ShaDirMixin
\ No newline at end of file
diff --git a/bt5/erp5_web_ung_role/TestTemplateItem/testUNGSecurity.py b/bt5/erp5_web_ung_role/TestTemplateItem/portal_components/test.erp5.testUNGSecurity.py
similarity index 100%
rename from bt5/erp5_web_ung_role/TestTemplateItem/testUNGSecurity.py
rename to bt5/erp5_web_ung_role/TestTemplateItem/portal_components/test.erp5.testUNGSecurity.py
diff --git a/bt5/erp5_web_ung_role/TestTemplateItem/portal_components/test.erp5.testUNGSecurity.xml b/bt5/erp5_web_ung_role/TestTemplateItem/portal_components/test.erp5.testUNGSecurity.xml
new file mode 100644
index 0000000000..f5fb07fdff
--- /dev/null
+++ b/bt5/erp5_web_ung_role/TestTemplateItem/portal_components/test.erp5.testUNGSecurity.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testUNGSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testUNGSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844537.95</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_ung_role/bt/change_log b/bt5/erp5_web_ung_role/bt/change_log
index bb5fee7f9f..a13fe64140 100644
--- a/bt5/erp5_web_ung_role/bt/change_log
+++ b/bt5/erp5_web_ung_role/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-03-01 gabriel
 * Add roles to allow erp5 user manage events in Event Module
 * Initial commit to testUNGSecurity
diff --git a/bt5/erp5_web_ung_role/bt/revision b/bt5/erp5_web_ung_role/bt/revision
index 3e932fe8f1..597975b413 100644
--- a/bt5/erp5_web_ung_role/bt/revision
+++ b/bt5/erp5_web_ung_role/bt/revision
@@ -1 +1 @@
-34
\ No newline at end of file
+35
\ No newline at end of file
diff --git a/bt5/erp5_web_ung_role/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_web_ung_role/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..143149b9d1
--- /dev/null
+++ b/bt5/erp5_web_ung_role/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testUNGSecurity
\ No newline at end of file
diff --git a/bt5/erp5_web_ung_role/bt/template_test_id_list b/bt5/erp5_web_ung_role/bt/template_test_id_list
index 044f1a6dd0..f823adf12e 100644
--- a/bt5/erp5_web_ung_role/bt/template_test_id_list
+++ b/bt5/erp5_web_ung_role/bt/template_test_id_list
@@ -1 +1 @@
-testUNGSecurity
\ No newline at end of file
+test.erp5.testUNGSecurity
\ No newline at end of file
diff --git a/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py b/bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.py
similarity index 100%
rename from bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
rename to bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.py
diff --git a/bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.xml b/bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.xml
new file mode 100644
index 0000000000..60403e5b11
--- /dev/null
+++ b/bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testUNG</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testUNG</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844492.11</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_web_ung_theme/bt/change_log b/bt5/erp5_web_ung_theme/bt/change_log
index 8ace3486ba..12810b9cb9 100644
--- a/bt5/erp5_web_ung_theme/bt/change_log
+++ b/bt5/erp5_web_ung_theme/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2012-12-13 Ivan
 * Move "Web Page" adjustments that affect other ERP5 web themes here.
 
@@ -231,4 +234,4 @@
 * Added ERP5 Form to show contents allowed in UNG WebSite and added new styles to listbox
 
 2010-10-14 gabriel
-* Clean up the bt5 because all fields were moved to erp5_web_ung_core
+* Clean up the bt5 because all fields were moved to erp5_web_ung_core
\ No newline at end of file
diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision
index 5c9fe11c04..511fa83dfa 100644
--- a/bt5/erp5_web_ung_theme/bt/revision
+++ b/bt5/erp5_web_ung_theme/bt/revision
@@ -1 +1 @@
-413
\ No newline at end of file
+414
\ No newline at end of file
diff --git a/bt5/erp5_web_ung_theme/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_web_ung_theme/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..0d9e5c4828
--- /dev/null
+++ b/bt5/erp5_web_ung_theme/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testUNG
\ No newline at end of file
diff --git a/bt5/erp5_web_ung_theme/bt/template_test_id_list b/bt5/erp5_web_ung_theme/bt/template_test_id_list
index a9ca2e2937..6baa2806b8 100644
--- a/bt5/erp5_web_ung_theme/bt/template_test_id_list
+++ b/bt5/erp5_web_ung_theme/bt/template_test_id_list
@@ -1 +1 @@
-testUNG
\ No newline at end of file
+test.erp5.testUNG
\ No newline at end of file
diff --git a/bt5/erp5_wizard/ExtensionTemplateItem/WizardUtils.py b/bt5/erp5_wizard/ExtensionTemplateItem/portal_components/extension.erp5.WizardUtils.py
similarity index 100%
rename from bt5/erp5_wizard/ExtensionTemplateItem/WizardUtils.py
rename to bt5/erp5_wizard/ExtensionTemplateItem/portal_components/extension.erp5.WizardUtils.py
diff --git a/bt5/erp5_wizard/ExtensionTemplateItem/portal_components/extension.erp5.WizardUtils.xml b/bt5/erp5_wizard/ExtensionTemplateItem/portal_components/extension.erp5.WizardUtils.xml
new file mode 100644
index 0000000000..1da27c7020
--- /dev/null
+++ b/bt5/erp5_wizard/ExtensionTemplateItem/portal_components/extension.erp5.WizardUtils.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>WizardUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.WizardUtils</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844532.02</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_wizard/bt/change_log b/bt5/erp5_wizard/bt/change_log
index bdc251408e..2cd838684f 100644
--- a/bt5/erp5_wizard/bt/change_log
+++ b/bt5/erp5_wizard/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2010-12-13 nicolas.dumazet
 * Migrate Tools to portal type classes
 
diff --git a/bt5/erp5_wizard/bt/revision b/bt5/erp5_wizard/bt/revision
index 89a16a7ddc..7b27b25197 100644
--- a/bt5/erp5_wizard/bt/revision
+++ b/bt5/erp5_wizard/bt/revision
@@ -1 +1 @@
-172
\ No newline at end of file
+173
\ No newline at end of file
diff --git a/bt5/erp5_wizard/bt/template_extension_id_list b/bt5/erp5_wizard/bt/template_extension_id_list
index e39bb8be36..cd92efb777 100644
--- a/bt5/erp5_wizard/bt/template_extension_id_list
+++ b/bt5/erp5_wizard/bt/template_extension_id_list
@@ -1 +1 @@
-WizardUtils
\ No newline at end of file
+extension.erp5.WizardUtils
\ No newline at end of file
diff --git a/bt5/erp5_wizard/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_wizard/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..b2b81c6d9f
--- /dev/null
+++ b/bt5/erp5_wizard/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.WizardUtils
\ No newline at end of file
diff --git a/bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/HTML5.py b/bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/portal_components/extension.erp5.HTML5.py
similarity index 100%
rename from bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/HTML5.py
rename to bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/portal_components/extension.erp5.HTML5.py
diff --git a/bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/portal_components/extension.erp5.HTML5.xml b/bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/portal_components/extension.erp5.HTML5.xml
new file mode 100644
index 0000000000..2f092d8659
--- /dev/null
+++ b/bt5/erp5_xhtml_gadget_style/ExtensionTemplateItem/portal_components/extension.erp5.HTML5.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>HTML5</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.HTML5</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844685.09</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_xhtml_gadget_style/bt/change_log b/bt5/erp5_xhtml_gadget_style/bt/change_log
index e3b18775e9..e7bf6c1fa0 100644
--- a/bt5/erp5_xhtml_gadget_style/bt/change_log
+++ b/bt5/erp5_xhtml_gadget_style/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2012-03-02 Ivan
 * Initial work
\ No newline at end of file
diff --git a/bt5/erp5_xhtml_gadget_style/bt/revision b/bt5/erp5_xhtml_gadget_style/bt/revision
index 978b4e8e51..a5c750feac 100644
--- a/bt5/erp5_xhtml_gadget_style/bt/revision
+++ b/bt5/erp5_xhtml_gadget_style/bt/revision
@@ -1 +1 @@
-26
\ No newline at end of file
+27
\ No newline at end of file
diff --git a/bt5/erp5_xhtml_gadget_style/bt/template_extension_id_list b/bt5/erp5_xhtml_gadget_style/bt/template_extension_id_list
index 5834c93be1..af83396ab4 100644
--- a/bt5/erp5_xhtml_gadget_style/bt/template_extension_id_list
+++ b/bt5/erp5_xhtml_gadget_style/bt/template_extension_id_list
@@ -1 +1 @@
-HTML5
\ No newline at end of file
+extension.erp5.HTML5
\ No newline at end of file
diff --git a/bt5/erp5_xhtml_gadget_style/bt/template_keep_last_workflow_history_only_path_list b/bt5/erp5_xhtml_gadget_style/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..82aa9eaaa2
--- /dev/null
+++ b/bt5/erp5_xhtml_gadget_style/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.HTML5
\ No newline at end of file
diff --git a/bt5/networkcache_erp5/TestTemplateItem/ShaSecurityMixin.py b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.ShaSecurityMixin.py
similarity index 100%
rename from bt5/networkcache_erp5/TestTemplateItem/ShaSecurityMixin.py
rename to bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.ShaSecurityMixin.py
diff --git a/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.ShaSecurityMixin.xml b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.ShaSecurityMixin.xml
new file mode 100644
index 0000000000..6dcebdb7f9
--- /dev/null
+++ b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.ShaSecurityMixin.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>ShaSecurityMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.ShaSecurityMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844566.98</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/networkcache_erp5/TestTemplateItem/testShaCacheExternal.py b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheExternal.py
similarity index 100%
rename from bt5/networkcache_erp5/TestTemplateItem/testShaCacheExternal.py
rename to bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheExternal.py
diff --git a/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheExternal.xml b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheExternal.xml
new file mode 100644
index 0000000000..dacf66dda6
--- /dev/null
+++ b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheExternal.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testShaCacheExternal</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testShaCacheExternal</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844566.97</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/networkcache_erp5/TestTemplateItem/testShaCacheSecurity.py b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheSecurity.py
similarity index 100%
rename from bt5/networkcache_erp5/TestTemplateItem/testShaCacheSecurity.py
rename to bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheSecurity.py
diff --git a/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheSecurity.xml b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheSecurity.xml
new file mode 100644
index 0000000000..1d9ed1f9e6
--- /dev/null
+++ b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaCacheSecurity.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testShaCacheSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testShaCacheSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844566.98</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/networkcache_erp5/TestTemplateItem/testShaDirExternal.py b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirExternal.py
similarity index 100%
rename from bt5/networkcache_erp5/TestTemplateItem/testShaDirExternal.py
rename to bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirExternal.py
diff --git a/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirExternal.xml b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirExternal.xml
new file mode 100644
index 0000000000..6ff740c644
--- /dev/null
+++ b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirExternal.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testShaDirExternal</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testShaDirExternal</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844566.97</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/networkcache_erp5/TestTemplateItem/testShaDirSecurity.py b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirSecurity.py
similarity index 100%
rename from bt5/networkcache_erp5/TestTemplateItem/testShaDirSecurity.py
rename to bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirSecurity.py
diff --git a/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirSecurity.xml b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirSecurity.xml
new file mode 100644
index 0000000000..6facab5cb5
--- /dev/null
+++ b/bt5/networkcache_erp5/TestTemplateItem/portal_components/test.erp5.testShaDirSecurity.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testShaDirSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testShaDirSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844566.99</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/networkcache_erp5/bt/change_log b/bt5/networkcache_erp5/bt/change_log
index c2e7dbaadb..843b2f46f7 100644
--- a/bt5/networkcache_erp5/bt/change_log
+++ b/bt5/networkcache_erp5/bt/change_log
@@ -1,2 +1,5 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 27-05-2011 Lucas
 * Initial Import
\ No newline at end of file
diff --git a/bt5/networkcache_erp5/bt/revision b/bt5/networkcache_erp5/bt/revision
index d99e90eb96..8580e7b684 100644
--- a/bt5/networkcache_erp5/bt/revision
+++ b/bt5/networkcache_erp5/bt/revision
@@ -1 +1 @@
-29
\ No newline at end of file
+30
\ No newline at end of file
diff --git a/bt5/networkcache_erp5/bt/template_keep_last_workflow_history_only_path_list b/bt5/networkcache_erp5/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..42a20a7fc1
--- /dev/null
+++ b/bt5/networkcache_erp5/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,5 @@
+portal_components/test.erp5.testShaDirExternal
+portal_components/test.erp5.testShaCacheExternal
+portal_components/test.erp5.ShaSecurityMixin
+portal_components/test.erp5.testShaCacheSecurity
+portal_components/test.erp5.testShaDirSecurity
\ No newline at end of file
diff --git a/bt5/networkcache_erp5/bt/template_test_id_list b/bt5/networkcache_erp5/bt/template_test_id_list
index 7208580d16..19f41468ad 100644
--- a/bt5/networkcache_erp5/bt/template_test_id_list
+++ b/bt5/networkcache_erp5/bt/template_test_id_list
@@ -1,5 +1,5 @@
-testShaCacheSecurity
-testShaDirSecurity
-testShaDirExternal
-testShaCacheExternal
-ShaSecurityMixin
\ No newline at end of file
+test.erp5.testShaDirExternal
+test.erp5.testShaCacheExternal
+test.erp5.ShaSecurityMixin
+test.erp5.testShaCacheSecurity
+test.erp5.testShaDirSecurity
\ No newline at end of file
diff --git a/bt5/test_conflict_resolution/TestTemplateItem/testConflictResolution.py b/bt5/test_conflict_resolution/TestTemplateItem/portal_components/test.erp5.testConflictResolution.py
similarity index 100%
rename from bt5/test_conflict_resolution/TestTemplateItem/testConflictResolution.py
rename to bt5/test_conflict_resolution/TestTemplateItem/portal_components/test.erp5.testConflictResolution.py
diff --git a/bt5/test_conflict_resolution/TestTemplateItem/portal_components/test.erp5.testConflictResolution.xml b/bt5/test_conflict_resolution/TestTemplateItem/portal_components/test.erp5.testConflictResolution.xml
new file mode 100644
index 0000000000..8d48b08c19
--- /dev/null
+++ b/bt5/test_conflict_resolution/TestTemplateItem/portal_components/test.erp5.testConflictResolution.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testConflictResolution</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testConflictResolution</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844528.28</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/test_conflict_resolution/bt/revision b/bt5/test_conflict_resolution/bt/revision
index 7813681f5b..62f9457511 100644
--- a/bt5/test_conflict_resolution/bt/revision
+++ b/bt5/test_conflict_resolution/bt/revision
@@ -1 +1 @@
-5
\ No newline at end of file
+6
\ No newline at end of file
diff --git a/bt5/test_conflict_resolution/bt/template_keep_last_workflow_history_only_path_list b/bt5/test_conflict_resolution/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..8dbd2730db
--- /dev/null
+++ b/bt5/test_conflict_resolution/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/test.erp5.testConflictResolution
\ No newline at end of file
diff --git a/bt5/test_conflict_resolution/bt/template_test_id_list b/bt5/test_conflict_resolution/bt/template_test_id_list
index 74bfbbe686..405fdd37ce 100644
--- a/bt5/test_conflict_resolution/bt/template_test_id_list
+++ b/bt5/test_conflict_resolution/bt/template_test_id_list
@@ -1 +1 @@
-testConflictResolution
\ No newline at end of file
+test.erp5.testConflictResolution
\ No newline at end of file
diff --git a/bt5/tiolive_decouple_instance/ExtensionTemplateItem/TioLiveDecoupleInstance.py b/bt5/tiolive_decouple_instance/ExtensionTemplateItem/portal_components/extension.erp5.TioLiveDecoupleInstance.py
similarity index 100%
rename from bt5/tiolive_decouple_instance/ExtensionTemplateItem/TioLiveDecoupleInstance.py
rename to bt5/tiolive_decouple_instance/ExtensionTemplateItem/portal_components/extension.erp5.TioLiveDecoupleInstance.py
diff --git a/bt5/tiolive_decouple_instance/ExtensionTemplateItem/portal_components/extension.erp5.TioLiveDecoupleInstance.xml b/bt5/tiolive_decouple_instance/ExtensionTemplateItem/portal_components/extension.erp5.TioLiveDecoupleInstance.xml
new file mode 100644
index 0000000000..d12d1eac5d
--- /dev/null
+++ b/bt5/tiolive_decouple_instance/ExtensionTemplateItem/portal_components/extension.erp5.TioLiveDecoupleInstance.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>TioLiveDecoupleInstance</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.TioLiveDecoupleInstance</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844692.28</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/tiolive_decouple_instance/bt/change_log b/bt5/tiolive_decouple_instance/bt/change_log
index b3d43da13f..e31962a4a8 100644
--- a/bt5/tiolive_decouple_instance/bt/change_log
+++ b/bt5/tiolive_decouple_instance/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2011-03-22 lucas
 - We must hide the change password action, once the password management is done locally.
 
diff --git a/bt5/tiolive_decouple_instance/bt/revision b/bt5/tiolive_decouple_instance/bt/revision
index 19c7bdba7b..8e2afd3427 100644
--- a/bt5/tiolive_decouple_instance/bt/revision
+++ b/bt5/tiolive_decouple_instance/bt/revision
@@ -1 +1 @@
-16
\ No newline at end of file
+17
\ No newline at end of file
diff --git a/bt5/tiolive_decouple_instance/bt/template_extension_id_list b/bt5/tiolive_decouple_instance/bt/template_extension_id_list
index e118113bcb..947a2a6f88 100644
--- a/bt5/tiolive_decouple_instance/bt/template_extension_id_list
+++ b/bt5/tiolive_decouple_instance/bt/template_extension_id_list
@@ -1 +1 @@
-TioLiveDecoupleInstance
\ No newline at end of file
+extension.erp5.TioLiveDecoupleInstance
\ No newline at end of file
diff --git a/bt5/tiolive_decouple_instance/bt/template_keep_last_workflow_history_only_path_list b/bt5/tiolive_decouple_instance/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..4feaa8e052
--- /dev/null
+++ b/bt5/tiolive_decouple_instance/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1 @@
+portal_components/extension.erp5.TioLiveDecoupleInstance
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/DocumentExtraction.py b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.py
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/DocumentExtraction.py
rename to product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.py
diff --git a/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.xml b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.xml
new file mode 100644
index 0000000000..46130ff9e9
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DocumentExtraction</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.DocumentExtraction</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844421.31</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/StandardSecurity.py b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.StandardSecurity.py
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/StandardSecurity.py
rename to product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.StandardSecurity.py
diff --git a/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.StandardSecurity.xml b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.StandardSecurity.xml
new file mode 100644
index 0000000000..90a4c8b9fa
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.StandardSecurity.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Extension Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>StandardSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>extension.erp5.StandardSecurity</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Extension Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844421.31</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/TestTemplateItem/testActivityTool.py b/product/ERP5/bootstrap/erp5_core/TestTemplateItem/portal_components/test.erp5.testActivityTool.py
similarity index 100%
rename from product/ERP5/bootstrap/erp5_core/TestTemplateItem/testActivityTool.py
rename to product/ERP5/bootstrap/erp5_core/TestTemplateItem/portal_components/test.erp5.testActivityTool.py
diff --git a/product/ERP5/bootstrap/erp5_core/TestTemplateItem/portal_components/test.erp5.testActivityTool.xml b/product/ERP5/bootstrap/erp5_core/TestTemplateItem/portal_components/test.erp5.testActivityTool.xml
new file mode 100644
index 0000000000..324171847d
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/TestTemplateItem/portal_components/test.erp5.testActivityTool.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Test Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>testActivityTool</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>test.erp5.testActivityTool</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Test Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+    </pickle>
+    <pickle>
+      <tuple>
+        <none/>
+        <list>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>validate</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>ERP5TypeTestCase</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass>
+                      <global name="DateTime" module="DateTime.DateTime"/>
+                    </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1377844421.32</float>
+                        <string>GMT+9</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+            <item>
+                <key> <string>validation_state</string> </key>
+                <value> <string>validated</string> </value>
+            </item>
+          </dictionary>
+        </list>
+      </tuple>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log
index ef50641d53..65f5349e88 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_core/bt/change_log
@@ -1,3 +1,6 @@
+2013-08-28 arnaud.fontaine
+* ZODB Components: Migrate Documents, Extensions and Tests.
+
 2013-08-23 arnaud.fontaine
 * ZODB Components: Shorten ID by removing common erp5.component prefix.
 
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 5897ee98f9..34040e8175 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-41122
\ No newline at end of file
+41123
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_extension_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_extension_id_list
index 3c722df392..028dd3cdb5 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_extension_id_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_extension_id_list
@@ -1,2 +1,2 @@
-StandardSecurity
-DocumentExtraction
\ No newline at end of file
+extension.erp5.StandardSecurity
+extension.erp5.DocumentExtraction
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_keep_last_workflow_history_only_path_list b/product/ERP5/bootstrap/erp5_core/bt/template_keep_last_workflow_history_only_path_list
new file mode 100644
index 0000000000..280a314fb7
--- /dev/null
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_keep_last_workflow_history_only_path_list
@@ -0,0 +1,3 @@
+portal_components/extension.erp5.StandardSecurity
+portal_components/extension.erp5.DocumentExtraction
+portal_components/test.erp5.testActivityTool
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/bt/template_test_id_list b/product/ERP5/bootstrap/erp5_core/bt/template_test_id_list
index 2785bce703..5d7502f12a 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/template_test_id_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_test_id_list
@@ -1 +1 @@
-testActivityTool
\ No newline at end of file
+test.erp5.testActivityTool
\ No newline at end of file
-- 
2.30.9