From 2f2b85856e60cc6706b066a426148b58f378ce95 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 17 Sep 2008 09:05:00 +0000
Subject: [PATCH] Move "STAF tests" (functional-tests, stress-tests and system-tests) from "/tests" directory to "/tests/staf-tests" directory.

---
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.res                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.res                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.res                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.dat                                        |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPreamble.xml                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.dat                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif                                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif                                                                |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/config.dtd                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.res                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml                                                             |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/post_configuration.xml                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.res                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n.xml                                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.res                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.dat                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.res                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-0.ldif                                                                      |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.odt                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.res                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.res                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.res                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.res                       |    0 
 opends/tests/staf-tests/stress-tests/shared/data/quickstart/quickstart.ldif                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/windows-x86-64.properties                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.res                                                  |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/opendstools.xml                                                                            |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/run.ksh                                                                 |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPreamble.xml                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif                                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.res                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/LDAPMonitor.java                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.dat                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif                                                    |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-7.html                                           |    0 
 opends/tests/staf-tests/shared/java/parsingtool/README                                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_checkbehavior.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml                                                         |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/Linux.properties                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.dat                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/backends/manual_tests/160Entries.template                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml                                                                |    0 
 opends/tests/staf-tests/shared/java/parsingtool/ParseData.java                                                                                          |    0 
 opends/tests/staf-tests/shared/python/replication.py                                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.dat                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.dat                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_entry.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/photo2.uu                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.res                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/backend_cleanup.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.res                                                       |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/windows.properties                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-2.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif                                                            |    0 
 opends/tests/staf-tests/shared/functions/webcontainer.xml                                                                                               |    0 
 opends/tests/staf-tests/system-tests/report/opends_logo_sm.png                                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/SNMPMonitor.html                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif                                                             |    0 
 opends/tests/staf-tests/system-tests/phases/installation/installation_opends.xml                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.res                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/core_tf_filters.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml                                                                                  |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/ldap.xml                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/European.base64.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif                                                              |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/replay.bat                                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.res                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.res                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.res                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp4.UTF-8.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.dat                                 |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/SunOS-x86.properties                                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif                                                             |    0 
 opends/tests/staf-tests/shared/java/ldap/modifyAnAttribute.java                                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.res                                             |    0 
 opends/tests/staf-tests/shared/functions/environment.xml                                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/staf-installer.properties                                                                       |    4 ++--
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.res                                                           |    0 
 opends/tests/staf-tests/shared/functions/ldap.xml                                                                                                       |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModify.xml                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/setup/inc-options.ldif                                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.dat                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.res                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif                                                 |    0 
 opends/tests/staf-tests/system-tests/phases/log/log.py                                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_setup.xml                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.dat                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.res                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/snmp/manager.security                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml                                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml                                                  |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/SunOS-x86.properties                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.res                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.res                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.res                                                         |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/opendsadm.xml                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.res                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.res                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.res                                                |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif                                                         |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests no error.png                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/quickstart/quickstart.ldif                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.del.base64.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-frame.html              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_activation.xml                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.dat                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif                                                   |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-tree.html               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.dat                                                         |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/datas                                                              |    0 
 opends/tests/staf-tests/shared/python/snmp.py                                                                                                           |    0 
 opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_int.java                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.res                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml                                                                                    |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests.png                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.dat                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/src/Client.java                                                                                 |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/opendscfg.xml                                                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsOutputFile.java                   |    0 
 opends/tests/staf-tests/shared/functions/topology.xml                                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/my-report.xsl                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.res                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.res                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.dat                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/import.xml                                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.dat                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.dat                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.dat                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/MonitoringClient.html           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif                                                      |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Data.html             |    0 
 opends/tests/staf-tests/shared/java/ldap/addAnEntry.java                                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/ErrorTest.java                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif                                                                        |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/pre_configuration.xml                                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/gen-text-summary.xsl                                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/replication_cleanup.xml                                                                  |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-noframe.html                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/tasks/import.ldif                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif                                                            |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadLib.xml                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.8859-1.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/core_version_report.xml                                                                         |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-5.html                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/indexes/after-remove.filters                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/backend_setup.xml                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml                                                          |    0 
 opends/tests/staf-tests/system-tests/report/clientDetails.xsl                                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.res                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml                                                    |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/security_lib.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.dat                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.res                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasOutputFile.html  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.res                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif                                                            |    0 
 opends/tests/staf-tests/stress-tests/testcases/quickstart/quickstart.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/build.bat                                                                                                      |    4 ++--
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.dat                                                             |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/config.py.stubs                                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif                                                                    |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/last.names                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.res                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml                                                     |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/run.ksh                                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.res                                                       |    0 
 opends/tests/staf-tests/system-tests/scenario/conf.dtd                                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_defaultconf.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control2.ldif                                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-9.html                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml                                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes.png                                           |    0 
 opends/tests/staf-tests/shared/functions/tools.xml                                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.dat                                                           |    0 
 opends/tests/staf-tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/snmp/agent.security                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.res                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/multiple_filters.ldif                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_startup.ldif                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/snmp/snmp_start.ldif                                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/indexes/after-modify.filters                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.dat                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif                                                             |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasBuffer.html                |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/signals.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.dat                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.res                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_setup.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.dat                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.dat                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif                                                          |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-use.html                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-2.html                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.dat                                        |    0 
 opends/tests/staf-tests/system-tests/phases/configuration/configuration.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-0.ldif                                                                     |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif.xml                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif                                              |    0 
 opends/tests/staf-tests/stress-tests/testcases/runStressTests.xml                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/groups/group_lib.xml                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.res                                              |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/first.names                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.dat                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.res                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif                                                                    |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPostamble.xml                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif                                                           |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/failure.html                                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.dat                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/testspec-index-stylesheet.xsl                                                                       |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/SunOS.properties                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/failure.html                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.res                                          |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif                                                                 |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-14.html                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.res                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.res                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.res                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.res                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.dat                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.dat                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasOutputFile.html            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp.xml                                                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/ChartGenerator/src/org/opends/testqa/monitoringclient/ChartGenerator.java                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/_post.xml                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/SunOS-sparc.properties                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.res                                                       |    0 
 opends/tests/staf-tests/system-tests/phases/shared/java/addAnEntry.java                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/Short_Example.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.dat                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.dat                                                           |    0 
 opends/tests/staf-tests/system-tests/phases/generateLdif/scalablePerson.py                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.res                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.res                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/global_acis.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.del.UTF-8.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp5.UTF-8.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.res                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif                                                               |    0 
 opends/tests/staf-tests/system-tests/scenario/sample/sample.xml                                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/setup/imp-o1.ldif                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/privileges/add_new_root_user.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/I18n_Authentication_Test.base64.ldif                                             |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/run.ksh                                                                        |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/SunOS.properties                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.dat                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.dat                                             |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-summary.html            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.res                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml                                                                             |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml                                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-11.html                                          |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.html                                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/clu_start.ldif                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.res                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/incompatible_options.xml                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif                                                             |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasOutputFile.java                    |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPreamble.xml                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.res                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.res                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.dat                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif                                                            |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/UnknownAttribute.xml                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.res                                                           |    0 
 opends/tests/staf-tests/system-tests/phases/verdict/verdict.xml                                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/setup/dm-o1.ldif                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsconfig/get.dat                                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/European.8859-1.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/European.UTF-8.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.dat                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/privileges/addmozobj.ldif                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/config/config.py                                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.dat                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.res                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif                                                    |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoad.xml                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.res                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/I18n_Authentication_Test.UTF-8.ldif                                               |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.res                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.dat                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/MonitoringClient.html |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.res                                                       |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/replay.sh                                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif                                                  |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-10.html                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.dat                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.res                                         |    0 
 opends/tests/staf-tests/shared/functions/utils.xml                                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.res                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.res                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/clear_password.ref                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.res                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.dat                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_import.xml                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.dat                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.res                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml                                                                |    0 
 opends/tests/staf-tests/shared/functions/signals.xml                                                                                                    |    0 
 opends/tests/staf-tests/system-tests/phases/main_run_lib.xml                                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue1269                                                                    |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsBuffer.html     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.dat                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.res                                                             |    0 
 opends/tests/staf-tests/system-tests/phases/shared/java/modifyAnAttribute.java                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.dat                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.dat                                    |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksPreamble.xml                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif                                                 |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/staxcmd.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/tfitter.ldif                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/filters.ldif                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.dat                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_import/import_task.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-4.html                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif                                                                     |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/replication.xml                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.dat                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.res                                                       |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Worker.java                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif                                                    |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-frame.html                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.dat                                                 |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/data/99_ext_schema.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/backends/Append.ldif                                                                               |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPreamble.xml                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.mod.base64.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/security.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.res                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.res                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/gen-alltests-report.xsl                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif                                                             |    0 
 opends/tests/staf-tests/shared/java/snmp/SNMPTrapListener.java                                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.res                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DataTest.java                      |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/overview-tree.html                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.dat                                                       |    0 
 opends/tests/staf-tests/system-tests/report/result.xsl                                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.dat                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.dat                                                       |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml                                                                   |    0 
 opends/tests/staf-tests/shared/python/security.py                                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml                                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.res                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.res                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/make-ldif_template.ref                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.res                                        |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/run.ksh                                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.res                                        |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Server.java                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.res                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests.png                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.res                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/indexes/before-add.filters                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.res                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/_pre.xml                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/functestspec-stylesheet.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif                                                          |    0 
 opends/tests/staf-tests/shared/java/xmlToHtml/xmlToHtml.java                                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-0.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.res                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.res                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/monitoringPostamble.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml                                                                                        |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/run.ksh                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.res                                        |    0 
 opends/tests/staf-tests/shared/functions/staxcmd.xml                                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml                                                                 |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Client.java                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control1.ldif                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.dat                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif                                                  |    0 
 opends/tests/staf-tests/shared/functions/dsadm.xml                                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.res                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes.png                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif                                                                     |    0 
 opends/tests/staf-tests/system-tests/phases/generateLdif/organizationalPerson.py                                                                        |    0 
 opends/tests/staf-tests/shared/java/snmp/SNMPSet.java                                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.dat                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml                                                                                          |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-16.html                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif                                                    |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/build.ksh                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml                                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_defaultconf.xml                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif                                                 |    0 
 opends/tests/staf-tests/system-tests/phases/installation/installation.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.res                                                |    0 
 opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.dat                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.res                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml                                                                 |    0 
 opends/tests/staf-tests/system-tests/report/result.css                                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.res                                        |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadLib.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif                                                              |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/search.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif                                               |    0 
 opends/tests/staf-tests/shared/functions/security.xml                                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-3.ldif                                                                      |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPostamble.xml                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif                                                         |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/help-doc.html                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff.ref                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.dat                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif                                                            |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesLib.xml                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.res                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/LDAPMonitor.html      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif                                                            |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_cleanup.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.res                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/manual_tests/README_Issue543                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.res                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.dat                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_cleanup.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.res                                                         |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/windows.properties                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.res                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml                                    |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_1d22348e.png                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.dat                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.res                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/LDAPMonitor.html                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml                                                                                          |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/JVM.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsconfig/get2.dat                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.dat                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml                                                                                |    0 
 opends/tests/staf-tests/system-tests/phases/parser/object_lib.xml                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif                                                  |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_5562f3a7.png                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.res                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml                                                              |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadLib.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-2.ldif                                                                     |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/build.ksh                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif                                                |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/run.sh                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.dat                                                             |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadPostamble.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif                                                            |    0 
 opends/tests/staf-tests/shared/functions/baselib.xml                                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/core.xml                                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.dat                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif                                                     |    0 
 opends/tests/staf-tests/system-tests/phases/generateLdif/generateLdif.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.dat                                                        |    0 
 opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml                                                                          |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/SNMPMonitor.html      |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/gen-suites-report.xsl                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif                                                 |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_cleanup.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.dat                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/config.xml                                                              |    0 
 opends/tests/staf-tests/system-tests/phases/shared/java/modifyAnAttribute.class                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.dat                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/verdictOpends/verdictOpends.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/indexes/before-modify.filters                                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml                                                    |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/run.ksh                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.dat                                                           |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/ExtendedRandom.java                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif                                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/errors                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.dat                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.dat                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.res                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif                                                      |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Data.html                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.dat                                                 |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/SNMPMonitor.java                        |    0 
 opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPersonJpeg1Mb.py                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.res                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/setup/sec-o1.ldif                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/backendsetup.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.res                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.dat                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_filterfile_and_attribute.ref                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml                                                        |    0 
 opends/tests/staf-tests/system-tests/phases/scheduler/scheduler.xml                                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.dat                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsOutputFile.html |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml                                          |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/windows-x86-64.properties                                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoad.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.dat                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsconfig/list.dat                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml                                                                 |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DatasBufferTest.java               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.res                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Data_Comparison.tp1.8859-1.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.dat                                                             |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/stress-tests.cfg                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.dat                                         |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksLib.xml                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_1.ref                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bhall.pwd                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/I18n_Authentication_Test.8859-1.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml                                                                |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/sample2.xml                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.dat                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Add.8859-1.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks.xml                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif                                                   |    0 
 opends/tests/staf-tests/system-tests/phases/parser/parser.xml                                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.res                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.res                                                       |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Worker.java                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Data_Comparison.tp1.UTF-8.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.res                                                       |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Add.base64.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml                                                               |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/setup/pwd-security.ldif                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.dat                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Schema_extension.base64.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.dat                                                           |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Worker.java                                                          |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/interface.png                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml                                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.dat                                         |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-15.html                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/testspec-stylesheet.xsl                                                                             |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Server.java                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.res                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Modify.base64.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.res                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.res                                                       |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/build.ksh                                                               |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Server.java                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif                                                                      |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/JMXMonitor.html                 |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes moving average.png                             |    0 
 opends/tests/staf-tests/functional-tests/staf-installer.xml                                                                                             |    4 ++--
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.dat                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp4.base64.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.add.base64.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/indexes/search.filters                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.dat                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml                                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-6.html                                           |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Worker.java                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.dat                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.res                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif                                                     |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/staf-installer.properties                                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-13.html                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.res                                                       |    0 
 opends/tests/staf-tests/shared/java/parsingtool/TestFileList.java                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.dat                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.res                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.res                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.mod.UTF-8.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.dat                                                             |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m7be26253.png                                                    |    0 
 opends/tests/staf-tests/system-tests/phases/shared/java/addAnEntry.class                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.res                                                    |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/JMXMonitor.java                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.res                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.res                                                  |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/conf.xml                                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.res                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/searchRequests.xml                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Modify.base64.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.dat                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.res                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml                                                                  |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Client.java                                                                |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/single.xml                                                                                   |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPostamble.xml                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml                                                             |    0 
 opends/tests/staf-tests/shared/java/parsingtool/ArrayData.java                                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.dat                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/package-list                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.res                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Add.base64.ldif                                                     |    0 
 opends/tests/staf-tests/system-tests/scenario/sample/conf.xml                                                                                           |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksPostamble.xml                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml                                                              |    0 
 opends/tests/staf-tests/shared/functions/snmp.xml                                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.dat                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif                                                                          |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-1.html                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.dat                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.res                                                       |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/post_configuration.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/README                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.dat                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests moving average.png                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif                                                                   |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-8.html                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.dat                                                         |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/producers consumers.png                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.res                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/export.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.res                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasBuffer.html      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml                                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif                                                                    |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-17.html                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml                                                                 |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.jar                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.res                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes no error.png                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/security.xml                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml                                                |    0 
 opends/tests/staf-tests/system-tests/clients/restartDs/restartDs.xml                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml                                                 |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests moving average.png                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif                                                                        |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.dat                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_rdn.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.add.UTF-8.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-1.ldif                                                                      |    0 
 opends/tests/staf-tests/system-tests/phases/log/topology.xml                                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.dat                                                |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Error.html                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.dat                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.res                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif                                                                        |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/Linux.properties                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.dat                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify.ref                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.dat                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.res                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml                                                                                |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_7b0973b5.png                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif                                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif                                                                  |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/errors                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_start.ldif                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.res                                                   |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPostamble.xml                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/manual_tests/README_issue588                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.res                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif                                                                   |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Error.html            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.res                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.dat                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.dat                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.dat                                                       |    0 
 opends/tests/staf-tests/system-tests/phases/main_run.xml                                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.res                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/deprecated-list.html                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.dat                                   |    0 
 opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.dat                                        |    0 
 opends/tests/staf-tests/system-tests/phases/generateLdif/person.py                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoad.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/replay.sh                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.res                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.res                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.dat                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/datas                                                               |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/utils.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/backup.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_singlevalue.ref                                                                      |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyLib.xml                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml                                                     |    0 
 opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPerson.py                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif                                                                |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Client.java                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml                                                  |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.dat                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.res                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.dat                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/photo1.uu                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.res                                 |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-3.html                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.dat                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml                                                                            |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/SunOS-sparc.properties                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.res                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/interface.odt                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Modify.8859-1.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.dat                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.dat                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml                                                                          |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/conf.xml                                                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.res                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/SNMP.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-1.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/windows-x86-32.properties                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml                                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesLDAPAttributes.xml                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif                                                    |    0 
 opends/tests/staf-tests/stress-tests/testcases/runTestJob.xml                                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.dat                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml                                                  |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-18.html                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.dat                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp1_Add.base64.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.dat                                                    |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/src/Worker.java                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/oasis.ldif                                                                         |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadPostamble.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Data.java                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_setup.xml                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp2.UTF-8.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/indexes/before-remove.filters                                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/src/Server.java                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml                                                    |    0 
 opends/tests/staf-tests/system-tests/phases/log/log.xml                                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml                                                                                  |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Server.java                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.res                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.dat                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_6b7c8952.png                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Backends.UTF-8.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/encoded_password.ref                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.dat                                         |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Client.java                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/schema/schema_rfc_tests.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.res                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.dat                                                |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml                                                   |    0 
 opends/tests/staf-tests/stress-tests/staf-installer.xml                                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/null.pwd                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif                                                                   |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index.html                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/backends/import.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.dat                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.dat                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/replication.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.res                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/backends/backend_start.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif                                                                     |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ConfigHandler.html    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.dat                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_delete_entry.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Schema_extension.UTF-8.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue465                                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue464                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.dat                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml                                                               |    0 
 opends/tests/staf-tests/system-tests/config.py                                                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Add.8859-1.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/workaround-2201.ldif                                                                   |    0 
 opends/tests/staf-tests/stress-tests/config/config.py                                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue462                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.dat                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.res                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif                                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/constant-values.html                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif                                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/build.ksh                                                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Delete.8859-1.ldif                                                         |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/build.ksh                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.dat                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif                                                                  |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/resources/inherit.gif                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.dat                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml                                                                                 |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.res                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.dat                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif                                            |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPostamble.xml                                                     |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_defaultproperties.xml                                                                      |    0 
 opends/tests/staf-tests/shared/functions/dsconfig.xml                                                                                                   |    0 
 opends/tests/staf-tests/shared/stax.dtd                                                                                                                 |    0 
 opends/tests/staf-tests/system-tests/phases/scheduler/scheduler.py                                                                                      |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsOutputFile.html           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.dat                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesJMXAttributes.xml                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml                                                                  |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPreamble.xml                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Modify.8859-1.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.dat                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.dat                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.res                                                       |    0 
 opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_xml.java                                                                                   |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/build.ksh                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml                                                                       |    0 
 opends/tests/staf-tests/shared/java/snmp/SNMPGet.java                                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.res                                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/schema/schema_dynamic.xml                                                                            |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Worker.java                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif                                                       |    0 
 opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPersonEXTJpeg1Mb.py                                                                     |    0 
 opends/tests/staf-tests/shared/functions/stafcmd.xml                                                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif                                                                       |    0 
 opends/tests/staf-tests/ext/staf/dsmlService.jar                                                                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.dat                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_cleanup.xml                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif                                                    |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/monitoring.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.dat                                                       |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/opendssecurity.xml                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif                                                                   |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Server.java                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.dat                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_30.ref                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/dsmlfe.ldif                                                                        |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ConfigHandler.java                      |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/MonitoringClient.java                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/jks/jks_startup.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/runFuncTests.xml                                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-2.ldif                                                                      |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadPreamble.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif                                                          |    0 
 opends/tests/staf-tests/system-tests/clients/LDAPjdk/ldapjdk.jar                                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.res                                                 |    0 
 opends/tests/staf-tests/stress-tests/staf-installer/windows-x86-32.properties                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif                                                                    |    0 
 opends/tests/staf-tests/stress-tests/build.bat                                                                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.Ref.base64.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.res                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif                                                  |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Worker.java                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/setup/general_options.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.res                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadLib.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_add_entry.xml                                                                                |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/conf.xml                                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml                                                                      |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m28ee5bcd.png                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.res                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif                                                              |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.dat                                                         |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ConfigHandler.html              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.dat                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.res                                                 |    0 
 opends/tests/staf-tests/system-tests/scenario/4MMR/4MMR.xml                                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.dat                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/monitoringLib.xml                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.dat                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/JMXMonitor.html       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml                                                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/replay.bat                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.dat                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.res                                                       |    0 
 opends/tests/staf-tests/system-tests/scenario/sample2/pre_configuration.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.res                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/config.xml                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif                                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.res                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.res                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.dat                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/indexes/after-add.filters                                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp5.base64.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.tp1.base64.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.dat                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif.gz                                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.res                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.res                                              |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes moving average.png                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-1.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml                                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.res                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml                                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml                                 |    0 
 opends/tests/staf-tests/system-tests/phases/.main_run.xml.marks                                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif                                                                |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchLib.xml                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.dat                                         |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.dat                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.dat                                                             |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasBuffer.java                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif                                                           |    0 
 opends/tests/staf-tests/shared/python/common.py                                                                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif                                                                |    0 
 opends/tests/staf-tests/system-tests/phases/configuration/configuration_opends.xml                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.dat                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif                                                                |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/stylesheet.css                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.dat                                                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/xsl/gen-groups-report.xsl                                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif                                                  |    0 
 opends/tests/staf-tests/stress-tests/build                                                                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif                                                          |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/producers consumers.odt                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif                                                           |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Error.java                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.res                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.res                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml                                                                |    0 
 opends/tests/staf-tests/functional-tests/build                                                                                                          |    6 +++---
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-12.html                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif                                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/clu/disconnect.ldif                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.dat                                        |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml                                                                                   |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.res                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/replication/Example.ldif                                                                           |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Server.java                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.dat                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.res                                              |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml                                                                       |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsBuffer.java                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Add.8859-1.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.res                                                |    0 
 opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.res                                                             |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/monitoringPreamble.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif                                                 |    0 
 opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadPreamble.xml                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif                                                            |    0 
 opends/tests/staf-tests/functional-tests/shared/data/setup/pwd.ldif                                                                                     |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.dat                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif                                                    |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.dat                                             |    0 
 opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsBuffer.html               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp2.base64.ldif                                                   |    0 
 opends/tests/staf-tests/functional-tests/staf-installer/config.py.stubs                                                                                 |    4 ++--
 opends/tests/staf-tests/functional-tests/staf-installer/functional-tests.cfg                                                                            |    0 
 opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java                                                                                      |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.res                                                       |    0 
 opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntries.xml                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.res                                                           |    0 
 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_setup.xml                                                                      |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.res                                                           |    0 
 opends/tests/staf-tests/system-tests/phases/parser/parser.py                                                                                            |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml                                                        |    0 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml                                                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.dat                                 |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.dat                                                             |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.dat                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.dat                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.res                                                       |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif                                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif                                                               |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.res                                                  |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml                                                                  |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif                                                          |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif                                                         |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif                                |    0 
 opends/tests/staf-tests/system-tests/phases/shared/functions/stafcmd.xml                                                                                |    0 
 opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif                                                              |    0 
 opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif                                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.res                                                        |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.res                    |    0 
 opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml                                                           |    0 
 opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.res                                                       |    0 
 2,177 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/opends/tests/ext/staf/dsmlService.jar b/opends/tests/staf-tests/ext/staf/dsmlService.jar
similarity index 100%
rename from opends/tests/ext/staf/dsmlService.jar
rename to opends/tests/staf-tests/ext/staf/dsmlService.jar
Binary files differ
diff --git a/opends/tests/functional-tests/build b/opends/tests/staf-tests/functional-tests/build
similarity index 91%
rename from opends/tests/functional-tests/build
rename to opends/tests/staf-tests/functional-tests/build
index ec506ca..c50d17a 100755
--- a/opends/tests/functional-tests/build
+++ b/opends/tests/staf-tests/functional-tests/build
@@ -34,7 +34,7 @@
 # the path and try to figure it out.
 if test -z "${JAVA_HOME}"
 then
-  JAVA_HOME=`java -cp ../../resource FindJavaHome`
+  JAVA_HOME=`java -cp ../../../resource FindJavaHome`
   if test -z "${JAVA_HOME}"
   then
     echo "Please set JAVA_HOME to the root of a Java 5.0 installation."
@@ -44,8 +44,8 @@
   fi
 fi
 
-OPENDS_LIB=`cd ../../lib;pwd`
-ANT_HOME=`cd ../..;pwd`/ext/ant
+OPENDS_LIB=`cd ../../../lib;pwd`
+ANT_HOME=`cd ../../..;pwd`/ext/ant
 export ANT_HOME
 # Execute the ant script and pass it any additional command-line arguments.
 $ANT_HOME/bin/ant -lib $OPENDS_LIB/mail.jar:$OPENDS_LIB/activation.jar -f staf-installer.xml ${*}
diff --git a/opends/tests/functional-tests/build.bat b/opends/tests/staf-tests/functional-tests/build.bat
similarity index 94%
rename from opends/tests/functional-tests/build.bat
rename to opends/tests/staf-tests/functional-tests/build.bat
index 64ecf4c..82b8b42 100644
--- a/opends/tests/functional-tests/build.bat
+++ b/opends/tests/staf-tests/functional-tests/build.bat
@@ -29,7 +29,7 @@
 
 rem These are the variables we need to run the functional tests
 set FT_HOME=%~dP0
-set ANT_HOME=%FT_HOME%\..\..\ext\ant
+set ANT_HOME=%FT_HOME%\..\..\..\ext\ant
 
 if "%JAVA_HOME%" == "" goto noJavaHome
 goto runAnt
@@ -46,7 +46,7 @@
 echo   JAVA_HOME=%JAVA_HOME%
 if not "%*" == "" echo   your parameters=%*
 echo Now running ant ...
-set OPENDS_LIB=%FT_HOME%\..\..\lib
+set OPENDS_LIB=%FT_HOME%\..\..\..\lib
 "%ANT_HOME%\bin\ant" -lib "%OPENDS_LIB%\mail.jar;%OPENDS_LIB%\activation.jar" -f staf-installer.xml %*
 
 :end
diff --git a/opends/tests/functional-tests/config/config.py b/opends/tests/staf-tests/functional-tests/config/config.py
similarity index 100%
rename from opends/tests/functional-tests/config/config.py
rename to opends/tests/staf-tests/functional-tests/config/config.py
diff --git a/opends/tests/functional-tests/config/replication/3server_topology.txt b/opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt
similarity index 100%
rename from opends/tests/functional-tests/config/replication/3server_topology.txt
rename to opends/tests/staf-tests/functional-tests/config/replication/3server_topology.txt
diff --git a/opends/tests/functional-tests/config/replication/basic_topology.txt b/opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt
similarity index 100%
rename from opends/tests/functional-tests/config/replication/basic_topology.txt
rename to opends/tests/staf-tests/functional-tests/config/replication/basic_topology.txt
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_import/import_task.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_import/import_task.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_import/import_task.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_import/import_task.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif
diff --git a/opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif b/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif
diff --git a/opends/tests/functional-tests/shared/data/backends/Append.ldif b/opends/tests/staf-tests/functional-tests/shared/data/backends/Append.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/backends/Append.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/backends/Append.ldif
diff --git a/opends/tests/functional-tests/shared/data/backends/Example.ldif b/opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/backends/Example.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif
diff --git a/opends/tests/functional-tests/shared/data/backends/Example.ldif.gz b/opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif.gz
similarity index 100%
rename from opends/tests/functional-tests/shared/data/backends/Example.ldif.gz
rename to opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif.gz
Binary files differ
diff --git a/opends/tests/functional-tests/shared/data/backends/Exclude.ldif b/opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/backends/Exclude.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif
diff --git a/opends/tests/functional-tests/shared/data/backends/Include.ldif b/opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/backends/Include.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif
diff --git a/opends/tests/functional-tests/shared/data/backends/Schema.ldif b/opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/backends/Schema.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif
diff --git a/opends/tests/functional-tests/shared/data/backends/backend_start.ldif b/opends/tests/staf-tests/functional-tests/shared/data/backends/backend_start.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/backends/backend_start.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/backends/backend_start.ldif
diff --git a/opends/tests/functional-tests/shared/data/backends/manual_tests/160Entries.template b/opends/tests/staf-tests/functional-tests/shared/data/backends/manual_tests/160Entries.template
similarity index 100%
rename from opends/tests/functional-tests/shared/data/backends/manual_tests/160Entries.template
rename to opends/tests/staf-tests/functional-tests/shared/data/backends/manual_tests/160Entries.template
diff --git a/opends/tests/functional-tests/shared/data/clu/clear_password.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/clear_password.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/clear_password.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/clear_password.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/clu_start.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/clu_start.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/clu_start.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/clu_start.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/disconnect.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/disconnect.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/disconnect.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/disconnect.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/encoded_password.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/encoded_password.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/encoded_password.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/encoded_password.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/filters.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/filters.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/filters.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/filters.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/ldapsearch_checkbehavior.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_checkbehavior.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldapsearch_checkbehavior.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_checkbehavior.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/ldapsearch_filterfile_and_attribute.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_filterfile_and_attribute.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldapsearch_filterfile_and_attribute.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_filterfile_and_attribute.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_1.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_1.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_1.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_1.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_30.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_30.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_30.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldapsearch_simplepagesize_30.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/ldif-diff.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldif-diff.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/ldif-diff_singlevalue.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_singlevalue.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldif-diff_singlevalue.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_singlevalue.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/ldifmodify.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldifmodify.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif
diff --git a/opends/tests/functional-tests/shared/data/clu/make-ldif_template.ref b/opends/tests/staf-tests/functional-tests/shared/data/clu/make-ldif_template.ref
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/make-ldif_template.ref
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/make-ldif_template.ref
diff --git a/opends/tests/functional-tests/shared/data/clu/multiple_filters.ldif b/opends/tests/staf-tests/functional-tests/shared/data/clu/multiple_filters.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/clu/multiple_filters.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/clu/multiple_filters.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/control1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/control1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control1.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/control2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/control2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control2.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/core_start.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_start.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/core_start.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_start.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
diff --git a/opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
diff --git a/opends/tests/functional-tests/shared/data/dsml/ldif-files/dsmlfe.ldif b/opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/dsmlfe.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/ldif-files/dsmlfe.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/dsmlfe.ldif
diff --git a/opends/tests/functional-tests/shared/data/dsml/ldif-files/oasis.ldif b/opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/oasis.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/ldif-files/oasis.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/oasis.ldif
diff --git a/opends/tests/functional-tests/shared/data/dsml/ldif-files/search.ldif b/opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/search.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/ldif-files/search.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/ldif-files/search.ldif
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/01versionsuite/data/post_version.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/02oasissuite/data/search.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_emptyabandonid.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_errtag3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatched.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_mismatchedabandonid.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/abandon_missingtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_errtag3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_mismatched.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingdn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_missingtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_noname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/add_novalue_beexist.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_err_tags2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_namespace.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_missing_tags.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/batchrequest_wrong_namespace.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_emptydn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_errtag3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_mismatched.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_missingtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_noname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/compare_novalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_emptydn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_errtag3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_mismatched.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingdn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/delete_missingtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_emptyrequestname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_errtag3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatched.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/extendedrequest_mismatchedrequestparameters.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydeleteoldrdn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptydn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_emptyrdn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errdeleteoldrdn2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_errtag3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_mismatched.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingdn_rdn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_missingtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modDN_wrongnewSuperior.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_addnovalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_deletenovalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_errtag3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_mismatched.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingdn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_missingtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_noname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_nooperation.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/modify_replacenovalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyderefaliases.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptydn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyfilter.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_emptyscope.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_errtag3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_mismatched.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_missingtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noderefaliases.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_nofilter.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_noscope.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_sizelimit.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_timelimit.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/search_typesonly.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchattributes_noendtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnoname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_approxmatchnovalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnoname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_equalitymatchnovalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_extensibleMatchemptyoptions.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnoname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_greaterorequalnovalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalmissingtag.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnoname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_lessorequalnovalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_mismatchedtags.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_multiplenot.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_outofand.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_presentnoname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsmismatchedsubfilter2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnoname.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_substringsnosubfilter.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/searchfilter_unitaryor.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badsyntax.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_badxmlprolog3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_garbage.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_nosoapnamespace3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/03dsmlerrsuite/data/soap_unexpectedvalue.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add000.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add005.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add010.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add015.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add020.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add025.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add030.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add035.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add040.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add045.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add050.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add055.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add060.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add065.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add070.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add075.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add080.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add085.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add090.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add095.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add100.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add105.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add110.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add115.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add120.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add125.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add130.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add135.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add140.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add145.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add150.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add155.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add160.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add165.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add170.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add175.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add180.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add185.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add190.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add195.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add200.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/04addmodaddsuite/data/add999.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod000.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod005.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod010.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod015.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod020.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod025.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod030.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod035.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod040.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod045.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod050.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod055.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod060.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod065.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod070.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod075.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod080.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod085.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod090.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod095.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/05modsuite/data/mod999.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del-01.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del000.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del002.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del005.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del010.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del015.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del017.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del020.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del022.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del025.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del030.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del035.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del037.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del040.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del041.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del042.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del043.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del045.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del050.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del055.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del057.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del060.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del062.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del065.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del070.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del075.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del077.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del080.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del082.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del085.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del090.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del095.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del097.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del100.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del101.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del102.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del105.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del110.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del115.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del117.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del120.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del122.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del125.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del130.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del135.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del137.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del140.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del142.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del145.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del150.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del155.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del157.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del160.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del162.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del165.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del170.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del175.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del180.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del182.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del185.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del190.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del195.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/06delmoddelsuite/data/del999.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch000.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch005.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch010.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch015.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch020.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch025.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch030.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch035.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch040.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch045.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch050.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch055.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch060.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch065.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch070.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch075.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch080.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch085.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch090.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch095.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch100.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch105.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch110.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch115.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch120.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch125.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch126.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch127.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch128.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch130.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch135.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch140.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch145.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch149.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch150.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch155.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch160.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch165.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch170.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/07srchsuite/data/srch999.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/010_compare.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/020_compare.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/030_extended.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/060_bind_1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/070_bind_2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/080_bind_3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/090_bind_4.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/091_bind_4.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/100_bind_5.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/105_bind_5.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/110_bind_6.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/115_bindwithdn.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/120_multipost_bind_1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/130_multipost_bind_2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/140_multipost_bind_3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/150_multipost_bind_4.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/160_multipost_bind_5.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/170_multipost_bind_1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/180_multipost_bind_2.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/190_multipost_bind_3.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/200_multipost_bind_4.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/210_multipost_bind_5.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/300_ssl_init.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/310_sslserver_ano.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/320_sslserver_bind.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/330_sslserver_wgbind.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/340_sslclient_ano.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/350_sslclient_bind.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/360_sslserver_ano_CertO.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/370_sslclient_ano_CertO.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/380_ssl_server_bind_CertO.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/390_sslserver_wgbind_CertO.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/400_sslclient_bind_CertO.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/410_sslclient_wgbind_CertO.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/470_sslserver_ano_CertF.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/480_ssl_server_bind_CertF.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/490_sslserver_wgbind_CertF.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/530_sslclient_wgbind.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/540_sslclient_ano_CertF.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/550_sslclient_bind_CertF.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/560_sslclient_wgbind_CertF.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/08miscsuite/data/900_proxyauth_1.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn000.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn005.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn010.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn015.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn020.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn025.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn030.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn998.res
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.dat b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.dat
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.dat
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.dat
diff --git a/opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.res b/opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.res
similarity index 100%
rename from opends/tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.res
rename to opends/tests/staf-tests/functional-tests/shared/data/dsml/suites/09modDNsuite/data/moddn999.res
diff --git a/opends/tests/functional-tests/shared/data/groups/groups.ldif b/opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/groups/groups.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/Data_Comparison.tp1.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Data_Comparison.tp1.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/Data_Comparison.tp1.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Data_Comparison.tp1.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/European.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/European.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/European.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/European.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/I18n_Authentication_Test.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/I18n_Authentication_Test.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/I18n_Authentication_Test.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/I18n_Authentication_Test.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Add.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Add.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Add.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Add.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Delete.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Delete.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Delete.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp1_Delete.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Add.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Add.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Add.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Add.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Modify.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Modify.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Modify.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp2_Modify.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Add.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Add.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Add.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Add.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Modify.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Modify.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Modify.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/LDAPcmds_tp3_Modify.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.8859-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.8859-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.8859-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.8859-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/Schema_extension.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp2.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp2.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp2.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp2.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.add.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.add.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.add.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.add.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.del.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.del.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.del.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.del.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.mod.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.mod.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.mod.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp3.mod.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp4.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp4.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp4.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp4.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp5.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp5.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp5.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Authentication.tp5.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Backends.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Backends.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Backends.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Backends.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Data_Comparison.tp1.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Data_Comparison.tp1.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Data_Comparison.tp1.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Data_Comparison.tp1.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/European.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/European.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/European.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/European.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/I18n_Authentication_Test.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/I18n_Authentication_Test.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/I18n_Authentication_Test.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/I18n_Authentication_Test.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Schema_extension.UTF-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Schema_extension.UTF-8.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Schema_extension.UTF-8.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/UTF-8/Schema_extension.UTF-8.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp2.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp2.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp2.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp2.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.add.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.add.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.add.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.add.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.del.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.del.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.del.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.del.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.mod.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.mod.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.mod.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp3.mod.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp4.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp4.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp4.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp4.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp5.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp5.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp5.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Authentication.tp5.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.Ref.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.Ref.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.Ref.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.Ref.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.tp1.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.tp1.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.tp1.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Data_Comparison.tp1.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/European.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/European.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/European.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/European.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/I18n_Authentication_Test.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/I18n_Authentication_Test.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/I18n_Authentication_Test.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/I18n_Authentication_Test.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp1_Add.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp1_Add.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp1_Add.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp1_Add.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Add.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Add.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Add.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Add.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Modify.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Modify.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Modify.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp2_Modify.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Add.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Add.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Add.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Add.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Modify.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Modify.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Modify.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/LDAPcmds_tp3_Modify.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/README b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/README
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/README
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/README
diff --git a/opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Schema_extension.base64.ldif b/opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Schema_extension.base64.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/i18n/8-bit/base64/Schema_extension.base64.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/i18n/8-bit/base64/Schema_extension.base64.ldif
diff --git a/opends/tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif b/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif
diff --git a/opends/tests/functional-tests/shared/data/privileges/add_new_root_user.ldif b/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_new_root_user.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/privileges/add_new_root_user.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/privileges/add_new_root_user.ldif
diff --git a/opends/tests/functional-tests/shared/data/privileges/addmozobj.ldif b/opends/tests/staf-tests/functional-tests/shared/data/privileges/addmozobj.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/privileges/addmozobj.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/privileges/addmozobj.ldif
diff --git a/opends/tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif b/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif
diff --git a/opends/tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif b/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif
diff --git a/opends/tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif b/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif
diff --git a/opends/tests/functional-tests/shared/data/privileges/privileges_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/privileges/privileges_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif b/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif
diff --git a/opends/tests/functional-tests/shared/data/quickstart/quickstart.ldif b/opends/tests/staf-tests/functional-tests/shared/data/quickstart/quickstart.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/quickstart/quickstart.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/quickstart/quickstart.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/Example.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/Example.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/Example.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/Example.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/Short_Example.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/Short_Example.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/Short_Example.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/Short_Example.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/newtestuser-0.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-0.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/newtestuser-0.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-0.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/newtestuser-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/newtestuser-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/newtestuser-2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/newtestuser-2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-2.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/photo1.uu b/opends/tests/staf-tests/functional-tests/shared/data/replication/photo1.uu
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/photo1.uu
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/photo1.uu
diff --git a/opends/tests/functional-tests/shared/data/replication/photo2.uu b/opends/tests/staf-tests/functional-tests/shared/data/replication/photo2.uu
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/photo2.uu
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/photo2.uu
diff --git a/opends/tests/functional-tests/shared/data/replication/schemamods-0.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-0.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/schemamods-0.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-0.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/schemamods-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/schemamods-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/schemamods-2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/schemamods-2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-2.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/schemamods-3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/schemamods-3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-3.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/testuser-0.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-0.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/testuser-0.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-0.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/testuser-1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/testuser-1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-1.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/testuser-2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/testuser-2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-2.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/tfitter.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/tfitter.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/tfitter.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/tfitter.ldif
diff --git a/opends/tests/functional-tests/shared/data/replication/workaround-2201.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/workaround-2201.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/replication/workaround-2201.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/replication/workaround-2201.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif
diff --git a/opends/tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/bind_no_pwd/bhall.pwd b/opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bhall.pwd
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/bind_no_pwd/bhall.pwd
rename to opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bhall.pwd
diff --git a/opends/tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/bind_no_pwd/null.pwd b/opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/null.pwd
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/bind_no_pwd/null.pwd
rename to opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/null.pwd
diff --git a/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/jks/jks_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/jks/jks_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/jks/jks_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/jks/jks_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
diff --git a/opends/tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif b/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
diff --git a/opends/tests/functional-tests/shared/data/setup/dm-o1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/setup/dm-o1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/setup/dm-o1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/setup/dm-o1.ldif
diff --git a/opends/tests/functional-tests/shared/data/setup/imp-o1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/setup/imp-o1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/setup/imp-o1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/setup/imp-o1.ldif
diff --git a/opends/tests/functional-tests/shared/data/setup/inc-options.ldif b/opends/tests/staf-tests/functional-tests/shared/data/setup/inc-options.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/setup/inc-options.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/setup/inc-options.ldif
diff --git a/opends/tests/functional-tests/shared/data/setup/pwd-security.ldif b/opends/tests/staf-tests/functional-tests/shared/data/setup/pwd-security.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/setup/pwd-security.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/setup/pwd-security.ldif
diff --git a/opends/tests/functional-tests/shared/data/setup/pwd.ldif b/opends/tests/staf-tests/functional-tests/shared/data/setup/pwd.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/setup/pwd.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/setup/pwd.ldif
diff --git a/opends/tests/functional-tests/shared/data/setup/sec-o1.ldif b/opends/tests/staf-tests/functional-tests/shared/data/setup/sec-o1.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/setup/sec-o1.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/setup/sec-o1.ldif
diff --git a/opends/tests/functional-tests/shared/data/snmp/agent.security b/opends/tests/staf-tests/functional-tests/shared/data/snmp/agent.security
similarity index 100%
rename from opends/tests/functional-tests/shared/data/snmp/agent.security
rename to opends/tests/staf-tests/functional-tests/shared/data/snmp/agent.security
diff --git a/opends/tests/functional-tests/shared/data/snmp/manager.security b/opends/tests/staf-tests/functional-tests/shared/data/snmp/manager.security
similarity index 100%
rename from opends/tests/functional-tests/shared/data/snmp/manager.security
rename to opends/tests/staf-tests/functional-tests/shared/data/snmp/manager.security
diff --git a/opends/tests/functional-tests/shared/data/snmp/snmp_start.ldif b/opends/tests/staf-tests/functional-tests/shared/data/snmp/snmp_start.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/snmp/snmp_start.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/snmp/snmp_start.ldif
diff --git a/opends/tests/functional-tests/shared/data/tasks/import.ldif b/opends/tests/staf-tests/functional-tests/shared/data/tasks/import.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/tasks/import.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/tasks/import.ldif
diff --git a/opends/tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif b/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif
diff --git a/opends/tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif b/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif
similarity index 100%
rename from opends/tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif
rename to opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif
diff --git a/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet.xml b/opends/tests/staf-tests/functional-tests/shared/xsl/functestspec-stylesheet.xml
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/functestspec-stylesheet.xml
rename to opends/tests/staf-tests/functional-tests/shared/xsl/functestspec-stylesheet.xml
diff --git a/opends/tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml b/opends/tests/staf-tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml
rename to opends/tests/staf-tests/functional-tests/shared/xsl/functestspec-stylesheet_security.xml
diff --git a/opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl b/opends/tests/staf-tests/functional-tests/shared/xsl/gen-alltests-report.xsl
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/gen-alltests-report.xsl
rename to opends/tests/staf-tests/functional-tests/shared/xsl/gen-alltests-report.xsl
diff --git a/opends/tests/functional-tests/shared/xsl/gen-groups-report.xsl b/opends/tests/staf-tests/functional-tests/shared/xsl/gen-groups-report.xsl
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/gen-groups-report.xsl
rename to opends/tests/staf-tests/functional-tests/shared/xsl/gen-groups-report.xsl
diff --git a/opends/tests/functional-tests/shared/xsl/gen-suites-report.xsl b/opends/tests/staf-tests/functional-tests/shared/xsl/gen-suites-report.xsl
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/gen-suites-report.xsl
rename to opends/tests/staf-tests/functional-tests/shared/xsl/gen-suites-report.xsl
diff --git a/opends/tests/functional-tests/shared/xsl/gen-text-summary.xsl b/opends/tests/staf-tests/functional-tests/shared/xsl/gen-text-summary.xsl
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/gen-text-summary.xsl
rename to opends/tests/staf-tests/functional-tests/shared/xsl/gen-text-summary.xsl
diff --git a/opends/tests/functional-tests/shared/xsl/my-report.xsl b/opends/tests/staf-tests/functional-tests/shared/xsl/my-report.xsl
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/my-report.xsl
rename to opends/tests/staf-tests/functional-tests/shared/xsl/my-report.xsl
diff --git a/opends/tests/functional-tests/shared/xsl/testspec-index-stylesheet.xsl b/opends/tests/staf-tests/functional-tests/shared/xsl/testspec-index-stylesheet.xsl
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/testspec-index-stylesheet.xsl
rename to opends/tests/staf-tests/functional-tests/shared/xsl/testspec-index-stylesheet.xsl
diff --git a/opends/tests/functional-tests/shared/xsl/testspec-stylesheet.xsl b/opends/tests/staf-tests/functional-tests/shared/xsl/testspec-stylesheet.xsl
similarity index 100%
rename from opends/tests/functional-tests/shared/xsl/testspec-stylesheet.xsl
rename to opends/tests/staf-tests/functional-tests/shared/xsl/testspec-stylesheet.xsl
diff --git a/opends/tests/functional-tests/staf-installer.xml b/opends/tests/staf-tests/functional-tests/staf-installer.xml
similarity index 99%
rename from opends/tests/functional-tests/staf-installer.xml
rename to opends/tests/staf-tests/functional-tests/staf-installer.xml
index c446fbd..1a61f42 100644
--- a/opends/tests/functional-tests/staf-installer.xml
+++ b/opends/tests/staf-tests/functional-tests/staf-installer.xml
@@ -31,7 +31,7 @@
     This allows tests that need a running instance of staf to easily
     get one and hides all the complexity under the hood
   </description>
-  <dirname file="${basedir}/.." property="project.home"/>
+  <dirname file="${basedir}/../.." property="project.home"/>
   
   <!-- installer wide settings - top -->
     <property file="${project.home}/PRODUCT"/>
@@ -275,7 +275,7 @@
     <!-- adding dsml service extension -->
     <mkdir dir="${staf.install.dir}/services/dsml"/>
     <copy todir="${staf.install.dir}/services/dsml">
-      <fileset dir="${basedir}/../ext/staf" includes="dsmlService.jar"/>
+      <fileset dir="${basedir}/../../ext/staf" includes="dsmlService.jar"/>
     </copy>
 
   </target>
diff --git a/opends/tests/functional-tests/staf-installer/Linux.properties b/opends/tests/staf-tests/functional-tests/staf-installer/Linux.properties
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/Linux.properties
rename to opends/tests/staf-tests/functional-tests/staf-installer/Linux.properties
diff --git a/opends/tests/functional-tests/staf-installer/SunOS-sparc.properties b/opends/tests/staf-tests/functional-tests/staf-installer/SunOS-sparc.properties
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/SunOS-sparc.properties
rename to opends/tests/staf-tests/functional-tests/staf-installer/SunOS-sparc.properties
diff --git a/opends/tests/functional-tests/staf-installer/SunOS-x86.properties b/opends/tests/staf-tests/functional-tests/staf-installer/SunOS-x86.properties
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/SunOS-x86.properties
rename to opends/tests/staf-tests/functional-tests/staf-installer/SunOS-x86.properties
diff --git a/opends/tests/functional-tests/staf-installer/SunOS.properties b/opends/tests/staf-tests/functional-tests/staf-installer/SunOS.properties
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/SunOS.properties
rename to opends/tests/staf-tests/functional-tests/staf-installer/SunOS.properties
diff --git a/opends/tests/functional-tests/staf-installer/config.py.stubs b/opends/tests/staf-tests/functional-tests/staf-installer/config.py.stubs
similarity index 95%
rename from opends/tests/functional-tests/staf-installer/config.py.stubs
rename to opends/tests/staf-tests/functional-tests/staf-installer/config.py.stubs
index 700cf57..6701aa7 100644
--- a/opends/tests/functional-tests/staf-installer/config.py.stubs
+++ b/opends/tests/staf-tests/functional-tests/staf-installer/config.py.stubs
@@ -33,12 +33,12 @@
 OPENDSNAME                  = '${product.name}'
 ZIPNAME                     = '${product.name}.zip'
 ZIPPATH                     = '${product.package.dir}'
-TESTS_ROOT                  = '%s/tests' % OPENDSDIR
+TESTS_ROOT                  = '%s/tests/staf-tests' % OPENDSDIR
 TESTS_DIR                   = '%s/functional-tests' % TESTS_ROOT
 TESTS_SHARED_DIR            = '%s/shared' % TESTS_DIR
 TESTS_FUNCTIONS_DIR         = '%s/shared/functions' % TESTS_ROOT
 TESTS_DATA_DIR              = '%s/data' % TESTS_SHARED_DIR
-TESTS_JAVA_DIR		    = '%s/shared/java' % TESTS_ROOT
+TESTS_JAVA_DIR              = '%s/shared/java' % TESTS_ROOT
 DIRECTORY_INSTANCE_DN       = '${opends.admin.dn}'
 DIRECTORY_INSTANCE_PSWD     = '${opends.admin.pwd}'
 DIRECTORY_INSTANCE_DIR      = '%s' % TMPDIR
diff --git a/opends/tests/functional-tests/staf-installer/failure.html b/opends/tests/staf-tests/functional-tests/staf-installer/failure.html
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/failure.html
rename to opends/tests/staf-tests/functional-tests/staf-installer/failure.html
diff --git a/opends/tests/functional-tests/staf-installer/functional-tests.cfg b/opends/tests/staf-tests/functional-tests/staf-installer/functional-tests.cfg
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/functional-tests.cfg
rename to opends/tests/staf-tests/functional-tests/staf-installer/functional-tests.cfg
diff --git a/opends/tests/functional-tests/staf-installer/replay.bat b/opends/tests/staf-tests/functional-tests/staf-installer/replay.bat
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/replay.bat
rename to opends/tests/staf-tests/functional-tests/staf-installer/replay.bat
diff --git a/opends/tests/functional-tests/staf-installer/replay.sh b/opends/tests/staf-tests/functional-tests/staf-installer/replay.sh
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/replay.sh
rename to opends/tests/staf-tests/functional-tests/staf-installer/replay.sh
diff --git a/opends/tests/functional-tests/staf-installer/staf-installer.properties b/opends/tests/staf-tests/functional-tests/staf-installer/staf-installer.properties
similarity index 97%
rename from opends/tests/functional-tests/staf-installer/staf-installer.properties
rename to opends/tests/staf-tests/functional-tests/staf-installer/staf-installer.properties
index 08583a2..58d3193 100644
--- a/opends/tests/functional-tests/staf-installer/staf-installer.properties
+++ b/opends/tests/staf-tests/functional-tests/staf-installer/staf-installer.properties
@@ -28,7 +28,7 @@
 # Global section - bottom
 
 # Staf section - top
-staf.home=${project.home}${file.separator}tests${file.separator}functional-run
+staf.home=${project.home}${file.separator}tests${file.separator}staf-tests${file.separator}functional-run
 staf.installer.dir=${basedir}${file.separator}staf-installer
 staf.install.dir=${staf.home}${file.separator}staf
 staf.bin.dir=${staf.install.dir}${file.separator}bin
@@ -79,7 +79,7 @@
 bits.stax.archive=STAXV321.zip
 bits.http.archive=HTTPV300Beta13.zip
 ## where to download tomcat bits before install
-bits.webcontainer.download.dir=${project.home}${file.separator}tests${file.separator}ext
+bits.webcontainer.download.dir=${project.home}${file.separator}tests${file.separator}staf-tests${file.separator}ext
 bits.tomcat.download.url=http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.14/bin
 bits.tomcat.archive=apache-tomcat-6.0.14.zip
 # Downloader section - bottom
diff --git a/opends/tests/functional-tests/staf-installer/windows-x86-32.properties b/opends/tests/staf-tests/functional-tests/staf-installer/windows-x86-32.properties
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/windows-x86-32.properties
rename to opends/tests/staf-tests/functional-tests/staf-installer/windows-x86-32.properties
diff --git a/opends/tests/functional-tests/staf-installer/windows-x86-64.properties b/opends/tests/staf-tests/functional-tests/staf-installer/windows-x86-64.properties
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/windows-x86-64.properties
rename to opends/tests/staf-tests/functional-tests/staf-installer/windows-x86-64.properties
diff --git a/opends/tests/functional-tests/staf-installer/windows.properties b/opends/tests/staf-tests/functional-tests/staf-installer/windows.properties
similarity index 100%
rename from opends/tests/functional-tests/staf-installer/windows.properties
rename to opends/tests/staf-tests/functional-tests/staf-installer/windows.properties
diff --git a/opends/tests/functional-tests/testcases/aci/aci.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_add_entry.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_add_entry.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_delete_entry.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_delete_entry.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_effective_rights.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_import.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_import.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_import.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_import.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_entry.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_entry.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_rdn.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_rdn.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_proxy_auth.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_setup.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_target.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_target.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetcontrol.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_targetcontrol.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetscope.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/aci_targetscope.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml
diff --git a/opends/tests/functional-tests/testcases/aci/global_acis.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/global_acis.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/global_acis.xml
diff --git a/opends/tests/functional-tests/testcases/aci/manual_tests/README_Issue1269 b/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue1269
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/manual_tests/README_Issue1269
rename to opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue1269
diff --git a/opends/tests/functional-tests/testcases/aci/manual_tests/README_Issue462 b/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue462
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/manual_tests/README_Issue462
rename to opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue462
diff --git a/opends/tests/functional-tests/testcases/aci/manual_tests/README_Issue464 b/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue464
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/manual_tests/README_Issue464
rename to opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue464
diff --git a/opends/tests/functional-tests/testcases/aci/manual_tests/README_Issue465 b/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue465
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/manual_tests/README_Issue465
rename to opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue465
diff --git a/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
rename to opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml
diff --git a/opends/tests/functional-tests/testcases/backends/backend_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backend_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/backend_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/backend_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/backends/backend_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backend_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/backend_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/backend_setup.xml
diff --git a/opends/tests/functional-tests/testcases/backends/backends.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/backends.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
diff --git a/opends/tests/functional-tests/testcases/backends/backendsetup.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backendsetup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/backendsetup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/backendsetup.xml
diff --git a/opends/tests/functional-tests/testcases/backends/backup-tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/backup-tasks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks.xml
diff --git a/opends/tests/functional-tests/testcases/backends/backup.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/backup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/backup.xml
diff --git a/opends/tests/functional-tests/testcases/backends/export-tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/export-tasks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks.xml
diff --git a/opends/tests/functional-tests/testcases/backends/export.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/export.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/export.xml
diff --git a/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/import-tasks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks.xml
diff --git a/opends/tests/functional-tests/testcases/backends/import.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/import.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
diff --git a/opends/tests/functional-tests/testcases/backends/manual_tests/README_issue588 b/opends/tests/staf-tests/functional-tests/testcases/backends/manual_tests/README_issue588
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/manual_tests/README_issue588
rename to opends/tests/staf-tests/functional-tests/testcases/backends/manual_tests/README_issue588
diff --git a/opends/tests/functional-tests/testcases/backends/restore-tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/restore-tasks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks.xml
diff --git a/opends/tests/functional-tests/testcases/backends/restore.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/backends/restore.xml
rename to opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
rename to opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
diff --git a/opends/tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml b/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
diff --git a/opends/tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml b/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml
diff --git a/opends/tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml b/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
diff --git a/opends/tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
diff --git a/opends/tests/functional-tests/testcases/core/core.xml b/opends/tests/staf-tests/functional-tests/testcases/core/core.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/core.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/core.xml
diff --git a/opends/tests/functional-tests/testcases/core/core_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/core_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/core/core_entry_cache.xml b/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/core_entry_cache.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml
diff --git a/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml
diff --git a/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml b/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml
diff --git a/opends/tests/functional-tests/testcases/core/core_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/core_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml
diff --git a/opends/tests/functional-tests/testcases/core/core_tf_filters.xml b/opends/tests/staf-tests/functional-tests/testcases/core/core_tf_filters.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/core_tf_filters.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/core_tf_filters.xml
diff --git a/opends/tests/functional-tests/testcases/core/core_version_report.xml b/opends/tests/staf-tests/functional-tests/testcases/core/core_version_report.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/core/core_version_report.xml
rename to opends/tests/staf-tests/functional-tests/testcases/core/core_version_report.xml
diff --git a/opends/tests/functional-tests/testcases/dsconfig/dsconfig.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsconfig/dsconfig.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
diff --git a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
diff --git a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
diff --git a/opends/tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml
diff --git a/opends/tests/functional-tests/testcases/dsconfig/get.dat b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/get.dat
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsconfig/get.dat
rename to opends/tests/staf-tests/functional-tests/testcases/dsconfig/get.dat
diff --git a/opends/tests/functional-tests/testcases/dsconfig/get2.dat b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/get2.dat
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsconfig/get2.dat
rename to opends/tests/staf-tests/functional-tests/testcases/dsconfig/get2.dat
diff --git a/opends/tests/functional-tests/testcases/dsconfig/list.dat b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/list.dat
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsconfig/list.dat
rename to opends/tests/staf-tests/functional-tests/testcases/dsconfig/list.dat
diff --git a/opends/tests/functional-tests/testcases/dsml/dsml.xml b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsml/dsml.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml
diff --git a/opends/tests/functional-tests/testcases/dsml/dsml_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsml/dsml_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/dsml/dsml_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsml/dsml_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
diff --git a/opends/tests/functional-tests/testcases/dsml/dsml_test.xml b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/dsml/dsml_test.xml
rename to opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml
diff --git a/opends/tests/functional-tests/testcases/groups/group_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/groups/group_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/groups/group_dynamic.xml b/opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/groups/group_dynamic.xml
rename to opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml
diff --git a/opends/tests/functional-tests/testcases/groups/group_lib.xml b/opends/tests/staf-tests/functional-tests/testcases/groups/group_lib.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/groups/group_lib.xml
rename to opends/tests/staf-tests/functional-tests/testcases/groups/group_lib.xml
diff --git a/opends/tests/functional-tests/testcases/groups/group_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/groups/group_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml
diff --git a/opends/tests/functional-tests/testcases/groups/group_static_member.xml b/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/groups/group_static_member.xml
rename to opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml
diff --git a/opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml b/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/groups/group_static_uniquemember.xml
rename to opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml
diff --git a/opends/tests/functional-tests/testcases/groups/group_virtual_static.xml b/opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/groups/group_virtual_static.xml
rename to opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml
diff --git a/opends/tests/functional-tests/testcases/groups/groups.xml b/opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/groups/groups.xml
rename to opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml
diff --git a/opends/tests/functional-tests/testcases/i18n/i18n.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/i18n/i18n.xml
rename to opends/tests/staf-tests/functional-tests/testcases/i18n/i18n.xml
diff --git a/opends/tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
rename to opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
diff --git a/opends/tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
rename to opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
diff --git a/opends/tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
rename to opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
diff --git a/opends/tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
rename to opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
diff --git a/opends/tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
rename to opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
diff --git a/opends/tests/functional-tests/testcases/i18n/i18n_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/i18n/i18n_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/i18n/i18n_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/i18n/i18n_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml
diff --git a/opends/tests/functional-tests/testcases/indexes/after-add.filters b/opends/tests/staf-tests/functional-tests/testcases/indexes/after-add.filters
similarity index 100%
rename from opends/tests/functional-tests/testcases/indexes/after-add.filters
rename to opends/tests/staf-tests/functional-tests/testcases/indexes/after-add.filters
diff --git a/opends/tests/functional-tests/testcases/indexes/after-modify.filters b/opends/tests/staf-tests/functional-tests/testcases/indexes/after-modify.filters
similarity index 100%
rename from opends/tests/functional-tests/testcases/indexes/after-modify.filters
rename to opends/tests/staf-tests/functional-tests/testcases/indexes/after-modify.filters
diff --git a/opends/tests/functional-tests/testcases/indexes/after-remove.filters b/opends/tests/staf-tests/functional-tests/testcases/indexes/after-remove.filters
similarity index 100%
rename from opends/tests/functional-tests/testcases/indexes/after-remove.filters
rename to opends/tests/staf-tests/functional-tests/testcases/indexes/after-remove.filters
diff --git a/opends/tests/functional-tests/testcases/indexes/before-add.filters b/opends/tests/staf-tests/functional-tests/testcases/indexes/before-add.filters
similarity index 100%
rename from opends/tests/functional-tests/testcases/indexes/before-add.filters
rename to opends/tests/staf-tests/functional-tests/testcases/indexes/before-add.filters
diff --git a/opends/tests/functional-tests/testcases/indexes/before-modify.filters b/opends/tests/staf-tests/functional-tests/testcases/indexes/before-modify.filters
similarity index 100%
rename from opends/tests/functional-tests/testcases/indexes/before-modify.filters
rename to opends/tests/staf-tests/functional-tests/testcases/indexes/before-modify.filters
diff --git a/opends/tests/functional-tests/testcases/indexes/before-remove.filters b/opends/tests/staf-tests/functional-tests/testcases/indexes/before-remove.filters
similarity index 100%
rename from opends/tests/functional-tests/testcases/indexes/before-remove.filters
rename to opends/tests/staf-tests/functional-tests/testcases/indexes/before-remove.filters
diff --git a/opends/tests/functional-tests/testcases/indexes/indexes.xml b/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/indexes/indexes.xml
rename to opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
diff --git a/opends/tests/functional-tests/testcases/indexes/search.filters b/opends/tests/staf-tests/functional-tests/testcases/indexes/search.filters
similarity index 100%
rename from opends/tests/functional-tests/testcases/indexes/search.filters
rename to opends/tests/staf-tests/functional-tests/testcases/indexes/search.filters
diff --git a/opends/tests/functional-tests/testcases/logging/logging.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml
diff --git a/opends/tests/functional-tests/testcases/logging/logging_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/logging/logging_properties.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging_properties.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml
diff --git a/opends/tests/functional-tests/testcases/logging/logging_retention.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging_retention.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
diff --git a/opends/tests/functional-tests/testcases/logging/logging_retention_properties.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging_retention_properties.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml
diff --git a/opends/tests/functional-tests/testcases/logging/logging_rotation.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging_rotation.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
diff --git a/opends/tests/functional-tests/testcases/logging/logging_rotation_properties.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging_rotation_properties.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml
diff --git a/opends/tests/functional-tests/testcases/logging/logging_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml
diff --git a/opends/tests/functional-tests/testcases/logging/logging_writer.xml b/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/logging/logging_writer.xml
rename to opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
diff --git a/opends/tests/functional-tests/testcases/monitoring/monitoring.xml b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/monitoring/monitoring.xml
rename to opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml
diff --git a/opends/tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/monitoring/monitoring_componant.xml b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/monitoring/monitoring_componant.xml
rename to opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
diff --git a/opends/tests/functional-tests/testcases/monitoring/monitoring_provider.xml b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/monitoring/monitoring_provider.xml
rename to opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
diff --git a/opends/tests/functional-tests/testcases/monitoring/monitoring_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/monitoring/monitoring_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_setup.xml
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins.xml b/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/plugins/plugins.xml
rename to opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_7bit.xml b/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/plugins/plugins_7bit.xml
rename to opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/plugins/plugins_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_entryUUID.xml b/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
rename to opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_lastmod.xml b/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/plugins/plugins_lastmod.xml
rename to opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_refint.xml b/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/plugins/plugins_refint.xml
rename to opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/plugins/plugins_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_setup.xml
diff --git a/opends/tests/functional-tests/testcases/plugins/plugins_uniqueness.xml b/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
rename to opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_setup.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
diff --git a/opends/tests/functional-tests/testcases/privileges/privileges_users.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/privileges/privileges_users.xml
rename to opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
diff --git a/opends/tests/functional-tests/testcases/quickstart/quickstart.xml b/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/quickstart/quickstart.xml
rename to opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
diff --git a/opends/tests/functional-tests/testcases/replication/basic/basic.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/basic/basic.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
diff --git a/opends/tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
diff --git a/opends/tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
diff --git a/opends/tests/functional-tests/testcases/replication/changelog/changelog.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/changelog/changelog.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
diff --git a/opends/tests/functional-tests/testcases/replication/conflict/conflict.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/conflict/conflict.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
diff --git a/opends/tests/functional-tests/testcases/replication/encryption/encryption.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/encryption/encryption.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
diff --git a/opends/tests/functional-tests/testcases/replication/failover/failover.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/failover/failover.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
diff --git a/opends/tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
diff --git a/opends/tests/functional-tests/testcases/replication/replication.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/replication.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/replication.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/replication.xml
diff --git a/opends/tests/functional-tests/testcases/replication/replication_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/replication_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/replication_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/replication_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/replication/replication_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/replication_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
diff --git a/opends/tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
diff --git a/opends/tests/functional-tests/testcases/replication/schema/schema.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/schema/schema.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
diff --git a/opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
rename to opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
diff --git a/opends/tests/functional-tests/testcases/runFuncTests.xml b/opends/tests/staf-tests/functional-tests/testcases/runFuncTests.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/runFuncTests.xml
rename to opends/tests/staf-tests/functional-tests/testcases/runFuncTests.xml
diff --git a/opends/tests/functional-tests/testcases/runTestJob.xml b/opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/runTestJob.xml
rename to opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml
diff --git a/opends/tests/functional-tests/testcases/sample/sample.xml b/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/sample/sample.xml
rename to opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
diff --git a/opends/tests/functional-tests/testcases/schema/schema.xml b/opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/schema/schema.xml
rename to opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml
diff --git a/opends/tests/functional-tests/testcases/schema/schema_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/schema/schema_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml b/opends/tests/staf-tests/functional-tests/testcases/schema/schema_dynamic.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
rename to opends/tests/staf-tests/functional-tests/testcases/schema/schema_dynamic.xml
diff --git a/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/schema/schema_rfc_tests.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
rename to opends/tests/staf-tests/functional-tests/testcases/schema/schema_rfc_tests.xml
diff --git a/opends/tests/functional-tests/testcases/schema/schema_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/schema/schema_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml b/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml b/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml b/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
diff --git a/opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml b/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/account_activation/security_test_account.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
diff --git a/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml b/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml b/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml b/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
diff --git a/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml b/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/client_auth/client_auth.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
diff --git a/opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/jks/security_jks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/jks/security_setup_jks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
diff --git a/opends/tests/functional-tests/testcases/security/manual_tests/README_Issue543 b/opends/tests/staf-tests/functional-tests/testcases/security/manual_tests/README_Issue543
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/manual_tests/README_Issue543
rename to opends/tests/staf-tests/functional-tests/testcases/security/manual_tests/README_Issue543
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
diff --git a/opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_disable_max_pwd_age.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_enable_max_pwd_age.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_grace_login.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_last_login.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_duration.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_lockout_fail_cnt.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_min_pwd_age.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_mult_pwd_policies.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_preencoded_pwds.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_setup_pwd_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_teardown_pwd_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy/security_user_pwd_policy.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_auth.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_policy_root/security_root_user_tests.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_blowfish.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
diff --git a/opends/tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_new.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
diff --git a/opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
diff --git a/opends/tests/functional-tests/testcases/security/security.xml b/opends/tests/staf-tests/functional-tests/testcases/security/security.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/security.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/security.xml
diff --git a/opends/tests/functional-tests/testcases/security/security_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/security_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/security/security_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/security_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml b/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml b/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml b/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
diff --git a/opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
rename to opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
diff --git a/opends/tests/functional-tests/testcases/setup/_post.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/_post.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/_post.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/_post.xml
diff --git a/opends/tests/functional-tests/testcases/setup/_pre.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/_pre.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/_pre.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/_pre.xml
diff --git a/opends/tests/functional-tests/testcases/setup/directory_manager.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/directory_manager.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
diff --git a/opends/tests/functional-tests/testcases/setup/general_options.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/general_options.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/general_options.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/general_options.xml
diff --git a/opends/tests/functional-tests/testcases/setup/import.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/import.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
diff --git a/opends/tests/functional-tests/testcases/setup/incompatible_options.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/incompatible_options.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/incompatible_options.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/incompatible_options.xml
diff --git a/opends/tests/functional-tests/testcases/setup/misc.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/misc.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
diff --git a/opends/tests/functional-tests/testcases/setup/ports.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/ports.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
diff --git a/opends/tests/functional-tests/testcases/setup/security.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/security.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
diff --git a/opends/tests/functional-tests/testcases/setup/setup.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/setup/setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_defaultproperties.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_defaultproperties.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_defaultproperties.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_defaultproperties.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_mibvalues.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_registermbean.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_registermbean.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_status.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_status.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_customconf.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_v1_defaultconf.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_defaultconf.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_v1_defaultconf.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v1_defaultconf.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_customconf.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_v2c_defaultconf.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_defaultconf.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_v2c_defaultconf.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v2c_defaultconf.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_customconf.xml
diff --git a/opends/tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml
rename to opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_v3_defaultconf.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/allowed-tasks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/backup_db.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/backup_db.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/export-ldif.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/export-ldif.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/import-ldif.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/import-ldif.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/restart_db.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/restart_db.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/restore_db.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/restore_db.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/setup.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml
diff --git a/opends/tests/functional-tests/testcases/tasks/tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/tasks/tasks.xml
rename to opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml
diff --git a/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
rename to opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
diff --git a/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
diff --git a/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
rename to opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
diff --git a/opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
similarity index 100%
rename from opends/tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
rename to opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
diff --git a/opends/tests/shared/functions/baselib.xml b/opends/tests/staf-tests/shared/functions/baselib.xml
similarity index 100%
rename from opends/tests/shared/functions/baselib.xml
rename to opends/tests/staf-tests/shared/functions/baselib.xml
diff --git a/opends/tests/shared/functions/dsadm.xml b/opends/tests/staf-tests/shared/functions/dsadm.xml
similarity index 100%
rename from opends/tests/shared/functions/dsadm.xml
rename to opends/tests/staf-tests/shared/functions/dsadm.xml
diff --git a/opends/tests/shared/functions/dsconfig.xml b/opends/tests/staf-tests/shared/functions/dsconfig.xml
similarity index 100%
rename from opends/tests/shared/functions/dsconfig.xml
rename to opends/tests/staf-tests/shared/functions/dsconfig.xml
diff --git a/opends/tests/shared/functions/environment.xml b/opends/tests/staf-tests/shared/functions/environment.xml
similarity index 100%
rename from opends/tests/shared/functions/environment.xml
rename to opends/tests/staf-tests/shared/functions/environment.xml
diff --git a/opends/tests/shared/functions/ldap.xml b/opends/tests/staf-tests/shared/functions/ldap.xml
similarity index 100%
rename from opends/tests/shared/functions/ldap.xml
rename to opends/tests/staf-tests/shared/functions/ldap.xml
diff --git a/opends/tests/shared/functions/security.xml b/opends/tests/staf-tests/shared/functions/security.xml
similarity index 100%
rename from opends/tests/shared/functions/security.xml
rename to opends/tests/staf-tests/shared/functions/security.xml
diff --git a/opends/tests/shared/functions/signals.xml b/opends/tests/staf-tests/shared/functions/signals.xml
similarity index 100%
rename from opends/tests/shared/functions/signals.xml
rename to opends/tests/staf-tests/shared/functions/signals.xml
diff --git a/opends/tests/shared/functions/snmp.xml b/opends/tests/staf-tests/shared/functions/snmp.xml
similarity index 100%
rename from opends/tests/shared/functions/snmp.xml
rename to opends/tests/staf-tests/shared/functions/snmp.xml
diff --git a/opends/tests/shared/functions/stafcmd.xml b/opends/tests/staf-tests/shared/functions/stafcmd.xml
similarity index 100%
rename from opends/tests/shared/functions/stafcmd.xml
rename to opends/tests/staf-tests/shared/functions/stafcmd.xml
diff --git a/opends/tests/shared/functions/staxcmd.xml b/opends/tests/staf-tests/shared/functions/staxcmd.xml
similarity index 100%
rename from opends/tests/shared/functions/staxcmd.xml
rename to opends/tests/staf-tests/shared/functions/staxcmd.xml
diff --git a/opends/tests/shared/functions/tools.xml b/opends/tests/staf-tests/shared/functions/tools.xml
similarity index 100%
rename from opends/tests/shared/functions/tools.xml
rename to opends/tests/staf-tests/shared/functions/tools.xml
diff --git a/opends/tests/shared/functions/topology.xml b/opends/tests/staf-tests/shared/functions/topology.xml
similarity index 100%
rename from opends/tests/shared/functions/topology.xml
rename to opends/tests/staf-tests/shared/functions/topology.xml
diff --git a/opends/tests/shared/functions/utils.xml b/opends/tests/staf-tests/shared/functions/utils.xml
similarity index 100%
rename from opends/tests/shared/functions/utils.xml
rename to opends/tests/staf-tests/shared/functions/utils.xml
diff --git a/opends/tests/shared/functions/webcontainer.xml b/opends/tests/staf-tests/shared/functions/webcontainer.xml
similarity index 100%
rename from opends/tests/shared/functions/webcontainer.xml
rename to opends/tests/staf-tests/shared/functions/webcontainer.xml
diff --git a/opends/tests/shared/java/ldap/addAnEntry.java b/opends/tests/staf-tests/shared/java/ldap/addAnEntry.java
similarity index 100%
rename from opends/tests/shared/java/ldap/addAnEntry.java
rename to opends/tests/staf-tests/shared/java/ldap/addAnEntry.java
diff --git a/opends/tests/shared/java/ldap/modifyAnAttribute.java b/opends/tests/staf-tests/shared/java/ldap/modifyAnAttribute.java
similarity index 100%
rename from opends/tests/shared/java/ldap/modifyAnAttribute.java
rename to opends/tests/staf-tests/shared/java/ldap/modifyAnAttribute.java
diff --git a/opends/tests/shared/java/parsingtool/ArrayData.java b/opends/tests/staf-tests/shared/java/parsingtool/ArrayData.java
similarity index 100%
rename from opends/tests/shared/java/parsingtool/ArrayData.java
rename to opends/tests/staf-tests/shared/java/parsingtool/ArrayData.java
diff --git a/opends/tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java b/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
similarity index 100%
rename from opends/tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
rename to opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
diff --git a/opends/tests/shared/java/parsingtool/ParseData.java b/opends/tests/staf-tests/shared/java/parsingtool/ParseData.java
similarity index 100%
rename from opends/tests/shared/java/parsingtool/ParseData.java
rename to opends/tests/staf-tests/shared/java/parsingtool/ParseData.java
diff --git a/opends/tests/shared/java/parsingtool/README b/opends/tests/staf-tests/shared/java/parsingtool/README
similarity index 100%
rename from opends/tests/shared/java/parsingtool/README
rename to opends/tests/staf-tests/shared/java/parsingtool/README
diff --git a/opends/tests/shared/java/parsingtool/TestFileList.java b/opends/tests/staf-tests/shared/java/parsingtool/TestFileList.java
similarity index 100%
rename from opends/tests/shared/java/parsingtool/TestFileList.java
rename to opends/tests/staf-tests/shared/java/parsingtool/TestFileList.java
diff --git a/opends/tests/shared/java/parsingtool/WriteHTMLFile.java b/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java
similarity index 100%
rename from opends/tests/shared/java/parsingtool/WriteHTMLFile.java
rename to opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java
diff --git a/opends/tests/shared/java/parsingtool/WriteXMLFile_int.java b/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_int.java
similarity index 100%
rename from opends/tests/shared/java/parsingtool/WriteXMLFile_int.java
rename to opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_int.java
diff --git a/opends/tests/shared/java/parsingtool/WriteXMLFile_xml.java b/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_xml.java
similarity index 100%
rename from opends/tests/shared/java/parsingtool/WriteXMLFile_xml.java
rename to opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_xml.java
diff --git a/opends/tests/shared/java/snmp/SNMPGet.java b/opends/tests/staf-tests/shared/java/snmp/SNMPGet.java
similarity index 100%
rename from opends/tests/shared/java/snmp/SNMPGet.java
rename to opends/tests/staf-tests/shared/java/snmp/SNMPGet.java
diff --git a/opends/tests/shared/java/snmp/SNMPSet.java b/opends/tests/staf-tests/shared/java/snmp/SNMPSet.java
similarity index 100%
rename from opends/tests/shared/java/snmp/SNMPSet.java
rename to opends/tests/staf-tests/shared/java/snmp/SNMPSet.java
diff --git a/opends/tests/shared/java/snmp/SNMPTrapListener.java b/opends/tests/staf-tests/shared/java/snmp/SNMPTrapListener.java
similarity index 100%
rename from opends/tests/shared/java/snmp/SNMPTrapListener.java
rename to opends/tests/staf-tests/shared/java/snmp/SNMPTrapListener.java
diff --git a/opends/tests/shared/java/xmlToHtml/xmlToHtml.java b/opends/tests/staf-tests/shared/java/xmlToHtml/xmlToHtml.java
similarity index 100%
rename from opends/tests/shared/java/xmlToHtml/xmlToHtml.java
rename to opends/tests/staf-tests/shared/java/xmlToHtml/xmlToHtml.java
diff --git a/opends/tests/shared/python/common.py b/opends/tests/staf-tests/shared/python/common.py
similarity index 100%
rename from opends/tests/shared/python/common.py
rename to opends/tests/staf-tests/shared/python/common.py
diff --git a/opends/tests/shared/python/replication.py b/opends/tests/staf-tests/shared/python/replication.py
similarity index 100%
rename from opends/tests/shared/python/replication.py
rename to opends/tests/staf-tests/shared/python/replication.py
diff --git a/opends/tests/shared/python/security.py b/opends/tests/staf-tests/shared/python/security.py
similarity index 100%
rename from opends/tests/shared/python/security.py
rename to opends/tests/staf-tests/shared/python/security.py
diff --git a/opends/tests/shared/python/snmp.py b/opends/tests/staf-tests/shared/python/snmp.py
similarity index 100%
rename from opends/tests/shared/python/snmp.py
rename to opends/tests/staf-tests/shared/python/snmp.py
diff --git a/opends/tests/shared/stax.dtd b/opends/tests/staf-tests/shared/stax.dtd
similarity index 100%
rename from opends/tests/shared/stax.dtd
rename to opends/tests/staf-tests/shared/stax.dtd
diff --git a/opends/tests/stress-tests/build b/opends/tests/staf-tests/stress-tests/build
similarity index 100%
rename from opends/tests/stress-tests/build
rename to opends/tests/staf-tests/stress-tests/build
diff --git a/opends/tests/stress-tests/build.bat b/opends/tests/staf-tests/stress-tests/build.bat
similarity index 100%
rename from opends/tests/stress-tests/build.bat
rename to opends/tests/staf-tests/stress-tests/build.bat
diff --git a/opends/tests/stress-tests/config/config.py b/opends/tests/staf-tests/stress-tests/config/config.py
similarity index 100%
rename from opends/tests/stress-tests/config/config.py
rename to opends/tests/staf-tests/stress-tests/config/config.py
diff --git a/opends/tests/stress-tests/config/replication/basic_topology.txt b/opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt
similarity index 100%
rename from opends/tests/stress-tests/config/replication/basic_topology.txt
rename to opends/tests/staf-tests/stress-tests/config/replication/basic_topology.txt
diff --git a/opends/tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif b/opends/tests/staf-tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif
similarity index 100%
rename from opends/tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif
rename to opends/tests/staf-tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif
diff --git a/opends/tests/stress-tests/shared/data/quickstart/quickstart.ldif b/opends/tests/staf-tests/stress-tests/shared/data/quickstart/quickstart.ldif
similarity index 100%
rename from opends/tests/stress-tests/shared/data/quickstart/quickstart.ldif
rename to opends/tests/staf-tests/stress-tests/shared/data/quickstart/quickstart.ldif
diff --git a/opends/tests/stress-tests/staf-installer.xml b/opends/tests/staf-tests/stress-tests/staf-installer.xml
similarity index 100%
rename from opends/tests/stress-tests/staf-installer.xml
rename to opends/tests/staf-tests/stress-tests/staf-installer.xml
diff --git a/opends/tests/stress-tests/staf-installer/Linux.properties b/opends/tests/staf-tests/stress-tests/staf-installer/Linux.properties
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/Linux.properties
rename to opends/tests/staf-tests/stress-tests/staf-installer/Linux.properties
diff --git a/opends/tests/stress-tests/staf-installer/SunOS-sparc.properties b/opends/tests/staf-tests/stress-tests/staf-installer/SunOS-sparc.properties
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/SunOS-sparc.properties
rename to opends/tests/staf-tests/stress-tests/staf-installer/SunOS-sparc.properties
diff --git a/opends/tests/stress-tests/staf-installer/SunOS-x86.properties b/opends/tests/staf-tests/stress-tests/staf-installer/SunOS-x86.properties
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/SunOS-x86.properties
rename to opends/tests/staf-tests/stress-tests/staf-installer/SunOS-x86.properties
diff --git a/opends/tests/stress-tests/staf-installer/SunOS.properties b/opends/tests/staf-tests/stress-tests/staf-installer/SunOS.properties
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/SunOS.properties
rename to opends/tests/staf-tests/stress-tests/staf-installer/SunOS.properties
diff --git a/opends/tests/stress-tests/staf-installer/config.py.stubs b/opends/tests/staf-tests/stress-tests/staf-installer/config.py.stubs
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/config.py.stubs
rename to opends/tests/staf-tests/stress-tests/staf-installer/config.py.stubs
diff --git a/opends/tests/stress-tests/staf-installer/failure.html b/opends/tests/staf-tests/stress-tests/staf-installer/failure.html
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/failure.html
rename to opends/tests/staf-tests/stress-tests/staf-installer/failure.html
diff --git a/opends/tests/stress-tests/staf-installer/replay.bat b/opends/tests/staf-tests/stress-tests/staf-installer/replay.bat
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/replay.bat
rename to opends/tests/staf-tests/stress-tests/staf-installer/replay.bat
diff --git a/opends/tests/stress-tests/staf-installer/replay.sh b/opends/tests/staf-tests/stress-tests/staf-installer/replay.sh
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/replay.sh
rename to opends/tests/staf-tests/stress-tests/staf-installer/replay.sh
diff --git a/opends/tests/stress-tests/staf-installer/staf-installer.properties b/opends/tests/staf-tests/stress-tests/staf-installer/staf-installer.properties
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/staf-installer.properties
rename to opends/tests/staf-tests/stress-tests/staf-installer/staf-installer.properties
diff --git a/opends/tests/stress-tests/staf-installer/stress-tests.cfg b/opends/tests/staf-tests/stress-tests/staf-installer/stress-tests.cfg
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/stress-tests.cfg
rename to opends/tests/staf-tests/stress-tests/staf-installer/stress-tests.cfg
diff --git a/opends/tests/stress-tests/staf-installer/windows-x86-32.properties b/opends/tests/staf-tests/stress-tests/staf-installer/windows-x86-32.properties
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/windows-x86-32.properties
rename to opends/tests/staf-tests/stress-tests/staf-installer/windows-x86-32.properties
diff --git a/opends/tests/stress-tests/staf-installer/windows-x86-64.properties b/opends/tests/staf-tests/stress-tests/staf-installer/windows-x86-64.properties
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/windows-x86-64.properties
rename to opends/tests/staf-tests/stress-tests/staf-installer/windows-x86-64.properties
diff --git a/opends/tests/stress-tests/staf-installer/windows.properties b/opends/tests/staf-tests/stress-tests/staf-installer/windows.properties
similarity index 100%
rename from opends/tests/stress-tests/staf-installer/windows.properties
rename to opends/tests/staf-tests/stress-tests/staf-installer/windows.properties
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
diff --git a/opends/tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml
rename to opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml
diff --git a/opends/tests/stress-tests/testcases/quickstart/quickstart.xml b/opends/tests/staf-tests/stress-tests/testcases/quickstart/quickstart.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/quickstart/quickstart.xml
rename to opends/tests/staf-tests/stress-tests/testcases/quickstart/quickstart.xml
diff --git a/opends/tests/stress-tests/testcases/runStressTests.xml b/opends/tests/staf-tests/stress-tests/testcases/runStressTests.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/runStressTests.xml
rename to opends/tests/staf-tests/stress-tests/testcases/runStressTests.xml
diff --git a/opends/tests/stress-tests/testcases/runTestJob.xml b/opends/tests/staf-tests/stress-tests/testcases/runTestJob.xml
similarity index 100%
rename from opends/tests/stress-tests/testcases/runTestJob.xml
rename to opends/tests/staf-tests/stress-tests/testcases/runTestJob.xml
diff --git a/opends/tests/system-tests/clients/LDAPjdk/ldapjdk.jar b/opends/tests/staf-tests/system-tests/clients/LDAPjdk/ldapjdk.jar
similarity index 100%
rename from opends/tests/system-tests/clients/LDAPjdk/ldapjdk.jar
rename to opends/tests/staf-tests/system-tests/clients/LDAPjdk/ldapjdk.jar
Binary files differ
diff --git a/opends/tests/system-tests/clients/modifyLoad/build.ksh b/opends/tests/staf-tests/system-tests/clients/modifyLoad/build.ksh
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/build.ksh
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/build.ksh
diff --git a/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml b/opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoad.xml
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoad.xml
diff --git a/opends/tests/system-tests/clients/modifyLoad/modifyLoadLib.xml b/opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadLib.xml
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/modifyLoadLib.xml
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadLib.xml
diff --git a/opends/tests/system-tests/clients/modifyLoad/modifyLoadPostamble.xml b/opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/modifyLoadPostamble.xml
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadPostamble.xml
diff --git a/opends/tests/system-tests/clients/modifyLoad/modifyLoadPreamble.xml b/opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/modifyLoadPreamble.xml
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/modifyLoadPreamble.xml
diff --git a/opends/tests/system-tests/clients/modifyLoad/run.ksh b/opends/tests/staf-tests/system-tests/clients/modifyLoad/run.ksh
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/run.ksh
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/run.ksh
diff --git a/opends/tests/system-tests/clients/modifyLoad/src/Client.java b/opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Client.java
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/src/Client.java
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Client.java
diff --git a/opends/tests/system-tests/clients/modifyLoad/src/Server.java b/opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Server.java
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/src/Server.java
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Server.java
diff --git a/opends/tests/system-tests/clients/modifyLoad/src/Worker.java b/opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Worker.java
similarity index 100%
rename from opends/tests/system-tests/clients/modifyLoad/src/Worker.java
rename to opends/tests/staf-tests/system-tests/clients/modifyLoad/src/Worker.java
diff --git a/opends/tests/system-tests/clients/monitoring/ChartGenerator/src/org/opends/testqa/monitoringclient/ChartGenerator.java b/opends/tests/staf-tests/system-tests/clients/monitoring/ChartGenerator/src/org/opends/testqa/monitoringclient/ChartGenerator.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/ChartGenerator/src/org/opends/testqa/monitoringclient/ChartGenerator.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/ChartGenerator/src/org/opends/testqa/monitoringclient/ChartGenerator.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/config.dtd b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/config.dtd
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/config.dtd
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/config.dtd
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/config.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/config.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/config.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/config.xml
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ConfigHandler.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ConfigHandler.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ConfigHandler.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ConfigHandler.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Data.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Data.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Data.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Data.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasBuffer.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasBuffer.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasBuffer.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasBuffer.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasOutputFile.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasOutputFile.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasOutputFile.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/DatasOutputFile.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Error.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Error.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Error.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/Error.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsBuffer.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsBuffer.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsBuffer.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsBuffer.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsOutputFile.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsOutputFile.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsOutputFile.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/ErrorsOutputFile.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/JMXMonitor.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/JMXMonitor.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/JMXMonitor.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/JMXMonitor.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/LDAPMonitor.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/LDAPMonitor.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/LDAPMonitor.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/LDAPMonitor.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/MonitoringClient.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/MonitoringClient.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/MonitoringClient.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/MonitoringClient.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/SNMPMonitor.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/SNMPMonitor.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/SNMPMonitor.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/src/org/opends/testqa/monitoringclient/SNMPMonitor.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DataTest.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DataTest.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DataTest.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DataTest.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DatasBufferTest.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DatasBufferTest.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DatasBufferTest.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/DatasBufferTest.java
diff --git a/opends/tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/ErrorTest.java b/opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/ErrorTest.java
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/ErrorTest.java
rename to opends/tests/staf-tests/system-tests/clients/monitoring/MonitoringClient/unitTest/org/opends/testqa/monitoringclient/ErrorTest.java
diff --git a/opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.odt b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.odt
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.odt
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0.odt
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_1d22348e.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_1d22348e.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_1d22348e.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_1d22348e.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_5562f3a7.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_5562f3a7.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_5562f3a7.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_5562f3a7.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_6b7c8952.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_6b7c8952.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_6b7c8952.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_6b7c8952.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_7b0973b5.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_7b0973b5.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_7b0973b5.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_7b0973b5.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m28ee5bcd.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m28ee5bcd.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m28ee5bcd.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m28ee5bcd.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m7be26253.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m7be26253.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m7be26253.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/MonitoringClient0.5.0_html_m7be26253.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/JVM.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/JVM.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/JVM.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/JVM.xml
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/SNMP.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/SNMP.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/SNMP.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/SNMP.xml
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/UnknownAttribute.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/UnknownAttribute.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/UnknownAttribute.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/UnknownAttribute.xml
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/config.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/config.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/config.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/config.xml
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesJMXAttributes.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesJMXAttributes.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesJMXAttributes.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesJMXAttributes.xml
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesLDAPAttributes.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesLDAPAttributes.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesLDAPAttributes.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/multiplesLDAPAttributes.xml
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/replication.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/replication.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/replication.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/replication.xml
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/searchRequests.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/searchRequests.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/ConfigFile/searchRequests.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/ConfigFile/searchRequests.xml
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes moving average.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes moving average.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes moving average.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes moving average.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP missing-changes.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests moving average.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests moving average.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests moving average.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests moving average.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/LDAP modifyRequests.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/datas b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/datas
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/datas
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/datas
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/errors b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/errors
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/errors
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesDatas/errors
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes moving average.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes moving average.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes moving average.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes moving average.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes no error.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes no error.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes no error.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes no error.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP missing-changes.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests moving average.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests moving average.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests moving average.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests moving average.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests no error.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests no error.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests no error.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests no error.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/LDAP modifyRequests.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/datas b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/datas
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/datas
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/datas
diff --git a/opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/errors b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/errors
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/errors
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/examples/MultiplesErrors/errors
diff --git a/opends/tests/system-tests/clients/monitoring/doc/interface.odt b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/interface.odt
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/interface.odt
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/interface.odt
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/interface.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/interface.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/interface.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/interface.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-frame.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-frame.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-frame.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-frame.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-noframe.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-noframe.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-noframe.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/allclasses-noframe.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/constant-values.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/constant-values.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/constant-values.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/constant-values.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/deprecated-list.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/deprecated-list.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/deprecated-list.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/deprecated-list.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/help-doc.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/help-doc.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/help-doc.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/help-doc.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-1.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-1.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-1.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-1.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-10.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-10.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-10.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-10.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-11.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-11.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-11.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-11.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-12.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-12.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-12.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-12.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-13.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-13.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-13.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-13.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-14.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-14.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-14.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-14.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-15.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-15.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-15.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-15.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-16.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-16.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-16.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-16.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-17.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-17.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-17.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-17.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-18.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-18.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-18.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-18.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-2.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-2.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-2.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-2.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-3.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-3.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-3.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-3.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-4.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-4.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-4.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-4.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-5.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-5.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-5.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-5.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-6.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-6.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-6.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-6.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-7.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-7.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-7.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-7.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-8.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-8.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-8.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-8.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-9.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-9.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-9.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index-files/index-9.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/index.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ConfigHandler.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ConfigHandler.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ConfigHandler.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ConfigHandler.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Data.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Data.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Data.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Data.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasBuffer.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasBuffer.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasBuffer.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasBuffer.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasOutputFile.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasOutputFile.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasOutputFile.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/DatasOutputFile.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Error.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Error.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Error.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/Error.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsBuffer.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsBuffer.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsBuffer.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsBuffer.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsOutputFile.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsOutputFile.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsOutputFile.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/ErrorsOutputFile.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/JMXMonitor.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/JMXMonitor.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/JMXMonitor.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/JMXMonitor.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/LDAPMonitor.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/LDAPMonitor.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/LDAPMonitor.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/LDAPMonitor.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/MonitoringClient.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/MonitoringClient.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/MonitoringClient.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/MonitoringClient.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/SNMPMonitor.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/SNMPMonitor.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/SNMPMonitor.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/SNMPMonitor.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ConfigHandler.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ConfigHandler.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ConfigHandler.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ConfigHandler.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Data.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Data.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Data.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Data.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasBuffer.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasBuffer.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasBuffer.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasBuffer.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasOutputFile.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasOutputFile.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasOutputFile.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/DatasOutputFile.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Error.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Error.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Error.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/Error.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsBuffer.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsBuffer.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsBuffer.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsBuffer.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsOutputFile.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsOutputFile.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsOutputFile.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/ErrorsOutputFile.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/JMXMonitor.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/JMXMonitor.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/JMXMonitor.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/JMXMonitor.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/LDAPMonitor.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/LDAPMonitor.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/LDAPMonitor.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/LDAPMonitor.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/MonitoringClient.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/MonitoringClient.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/MonitoringClient.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/MonitoringClient.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/SNMPMonitor.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/SNMPMonitor.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/SNMPMonitor.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/class-use/SNMPMonitor.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-frame.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-frame.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-frame.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-frame.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-summary.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-summary.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-summary.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-summary.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-tree.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-tree.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-tree.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-tree.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-use.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-use.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-use.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/org/opends/testqa/monitoringclient/package-use.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/overview-tree.html b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/overview-tree.html
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/overview-tree.html
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/overview-tree.html
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/package-list b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/package-list
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/package-list
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/package-list
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/resources/inherit.gif b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/resources/inherit.gif
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/resources/inherit.gif
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/resources/inherit.gif
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/stylesheet.css b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/stylesheet.css
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/stylesheet.css
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/javadoc-MonitoringClient/stylesheet.css
diff --git a/opends/tests/system-tests/clients/monitoring/doc/producers consumers.odt b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/producers consumers.odt
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/producers consumers.odt
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/producers consumers.odt
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/doc/producers consumers.png b/opends/tests/staf-tests/system-tests/clients/monitoring/doc/producers consumers.png
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/doc/producers consumers.png
rename to opends/tests/staf-tests/system-tests/clients/monitoring/doc/producers consumers.png
Binary files differ
diff --git a/opends/tests/system-tests/clients/monitoring/monitoring.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/monitoring.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/monitoring.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/monitoring.xml
diff --git a/opends/tests/system-tests/clients/monitoring/monitoringLib.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/monitoringLib.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/monitoringLib.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/monitoringLib.xml
diff --git a/opends/tests/system-tests/clients/monitoring/monitoringPostamble.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/monitoringPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/monitoringPostamble.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/monitoringPostamble.xml
diff --git a/opends/tests/system-tests/clients/monitoring/monitoringPreamble.xml b/opends/tests/staf-tests/system-tests/clients/monitoring/monitoringPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/clients/monitoring/monitoringPreamble.xml
rename to opends/tests/staf-tests/system-tests/clients/monitoring/monitoringPreamble.xml
diff --git a/opends/tests/system-tests/clients/restartDs/restartDs.xml b/opends/tests/staf-tests/system-tests/clients/restartDs/restartDs.xml
similarity index 100%
rename from opends/tests/system-tests/clients/restartDs/restartDs.xml
rename to opends/tests/staf-tests/system-tests/clients/restartDs/restartDs.xml
diff --git a/opends/tests/system-tests/clients/searchLoad/build.ksh b/opends/tests/staf-tests/system-tests/clients/searchLoad/build.ksh
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/build.ksh
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/build.ksh
diff --git a/opends/tests/system-tests/clients/searchLoad/run.ksh b/opends/tests/staf-tests/system-tests/clients/searchLoad/run.ksh
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/run.ksh
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/run.ksh
diff --git a/opends/tests/system-tests/clients/searchLoad/searchLoad.xml b/opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoad.xml
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/searchLoad.xml
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoad.xml
diff --git a/opends/tests/system-tests/clients/searchLoad/searchLoadLib.xml b/opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadLib.xml
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/searchLoadLib.xml
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadLib.xml
diff --git a/opends/tests/system-tests/clients/searchLoad/searchLoadPostamble.xml b/opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/searchLoadPostamble.xml
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadPostamble.xml
diff --git a/opends/tests/system-tests/clients/searchLoad/searchLoadPreamble.xml b/opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/searchLoadPreamble.xml
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/searchLoadPreamble.xml
diff --git a/opends/tests/system-tests/clients/searchLoad/src/Client.java b/opends/tests/staf-tests/system-tests/clients/searchLoad/src/Client.java
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/src/Client.java
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/src/Client.java
diff --git a/opends/tests/system-tests/clients/searchLoad/src/Server.java b/opends/tests/staf-tests/system-tests/clients/searchLoad/src/Server.java
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/src/Server.java
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/src/Server.java
diff --git a/opends/tests/system-tests/clients/searchLoad/src/Worker.java b/opends/tests/staf-tests/system-tests/clients/searchLoad/src/Worker.java
similarity index 100%
rename from opends/tests/system-tests/clients/searchLoad/src/Worker.java
rename to opends/tests/staf-tests/system-tests/clients/searchLoad/src/Worker.java
diff --git a/opends/tests/system-tests/clients/verdictOpends/verdictOpends.xml b/opends/tests/staf-tests/system-tests/clients/verdictOpends/verdictOpends.xml
similarity index 100%
rename from opends/tests/system-tests/clients/verdictOpends/verdictOpends.xml
rename to opends/tests/staf-tests/system-tests/clients/verdictOpends/verdictOpends.xml
diff --git a/opends/tests/system-tests/config.py b/opends/tests/staf-tests/system-tests/config.py
similarity index 100%
rename from opends/tests/system-tests/config.py
rename to opends/tests/staf-tests/system-tests/config.py
diff --git a/opends/tests/system-tests/phases/.main_run.xml.marks b/opends/tests/staf-tests/system-tests/phases/.main_run.xml.marks
similarity index 100%
rename from opends/tests/system-tests/phases/.main_run.xml.marks
rename to opends/tests/staf-tests/system-tests/phases/.main_run.xml.marks
diff --git a/opends/tests/system-tests/phases/configuration/configuration.xml b/opends/tests/staf-tests/system-tests/phases/configuration/configuration.xml
similarity index 100%
rename from opends/tests/system-tests/phases/configuration/configuration.xml
rename to opends/tests/staf-tests/system-tests/phases/configuration/configuration.xml
diff --git a/opends/tests/system-tests/phases/configuration/configuration_opends.xml b/opends/tests/staf-tests/system-tests/phases/configuration/configuration_opends.xml
similarity index 100%
rename from opends/tests/system-tests/phases/configuration/configuration_opends.xml
rename to opends/tests/staf-tests/system-tests/phases/configuration/configuration_opends.xml
diff --git a/opends/tests/system-tests/phases/generateLdif/generateLdif.xml b/opends/tests/staf-tests/system-tests/phases/generateLdif/generateLdif.xml
similarity index 100%
rename from opends/tests/system-tests/phases/generateLdif/generateLdif.xml
rename to opends/tests/staf-tests/system-tests/phases/generateLdif/generateLdif.xml
diff --git a/opends/tests/system-tests/phases/generateLdif/inetOrgPerson.py b/opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPerson.py
similarity index 100%
rename from opends/tests/system-tests/phases/generateLdif/inetOrgPerson.py
rename to opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPerson.py
diff --git a/opends/tests/system-tests/phases/generateLdif/inetOrgPersonEXTJpeg1Mb.py b/opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPersonEXTJpeg1Mb.py
similarity index 100%
rename from opends/tests/system-tests/phases/generateLdif/inetOrgPersonEXTJpeg1Mb.py
rename to opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPersonEXTJpeg1Mb.py
diff --git a/opends/tests/system-tests/phases/generateLdif/inetOrgPersonJpeg1Mb.py b/opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPersonJpeg1Mb.py
similarity index 100%
rename from opends/tests/system-tests/phases/generateLdif/inetOrgPersonJpeg1Mb.py
rename to opends/tests/staf-tests/system-tests/phases/generateLdif/inetOrgPersonJpeg1Mb.py
diff --git a/opends/tests/system-tests/phases/generateLdif/organizationalPerson.py b/opends/tests/staf-tests/system-tests/phases/generateLdif/organizationalPerson.py
similarity index 100%
rename from opends/tests/system-tests/phases/generateLdif/organizationalPerson.py
rename to opends/tests/staf-tests/system-tests/phases/generateLdif/organizationalPerson.py
diff --git a/opends/tests/system-tests/phases/generateLdif/person.py b/opends/tests/staf-tests/system-tests/phases/generateLdif/person.py
similarity index 100%
rename from opends/tests/system-tests/phases/generateLdif/person.py
rename to opends/tests/staf-tests/system-tests/phases/generateLdif/person.py
diff --git a/opends/tests/system-tests/phases/generateLdif/scalablePerson.py b/opends/tests/staf-tests/system-tests/phases/generateLdif/scalablePerson.py
similarity index 100%
rename from opends/tests/system-tests/phases/generateLdif/scalablePerson.py
rename to opends/tests/staf-tests/system-tests/phases/generateLdif/scalablePerson.py
diff --git a/opends/tests/system-tests/phases/installation/installation.xml b/opends/tests/staf-tests/system-tests/phases/installation/installation.xml
similarity index 100%
rename from opends/tests/system-tests/phases/installation/installation.xml
rename to opends/tests/staf-tests/system-tests/phases/installation/installation.xml
diff --git a/opends/tests/system-tests/phases/installation/installation_opends.xml b/opends/tests/staf-tests/system-tests/phases/installation/installation_opends.xml
similarity index 100%
rename from opends/tests/system-tests/phases/installation/installation_opends.xml
rename to opends/tests/staf-tests/system-tests/phases/installation/installation_opends.xml
diff --git a/opends/tests/system-tests/phases/log/log.py b/opends/tests/staf-tests/system-tests/phases/log/log.py
similarity index 100%
rename from opends/tests/system-tests/phases/log/log.py
rename to opends/tests/staf-tests/system-tests/phases/log/log.py
diff --git a/opends/tests/system-tests/phases/log/log.xml b/opends/tests/staf-tests/system-tests/phases/log/log.xml
similarity index 100%
rename from opends/tests/system-tests/phases/log/log.xml
rename to opends/tests/staf-tests/system-tests/phases/log/log.xml
diff --git a/opends/tests/system-tests/phases/log/topology.xml b/opends/tests/staf-tests/system-tests/phases/log/topology.xml
similarity index 100%
rename from opends/tests/system-tests/phases/log/topology.xml
rename to opends/tests/staf-tests/system-tests/phases/log/topology.xml
diff --git a/opends/tests/system-tests/phases/main_run.xml b/opends/tests/staf-tests/system-tests/phases/main_run.xml
similarity index 100%
rename from opends/tests/system-tests/phases/main_run.xml
rename to opends/tests/staf-tests/system-tests/phases/main_run.xml
diff --git a/opends/tests/system-tests/phases/main_run_lib.xml b/opends/tests/staf-tests/system-tests/phases/main_run_lib.xml
similarity index 100%
rename from opends/tests/system-tests/phases/main_run_lib.xml
rename to opends/tests/staf-tests/system-tests/phases/main_run_lib.xml
diff --git a/opends/tests/system-tests/phases/parser/object_lib.xml b/opends/tests/staf-tests/system-tests/phases/parser/object_lib.xml
similarity index 100%
rename from opends/tests/system-tests/phases/parser/object_lib.xml
rename to opends/tests/staf-tests/system-tests/phases/parser/object_lib.xml
diff --git a/opends/tests/system-tests/phases/parser/parser.py b/opends/tests/staf-tests/system-tests/phases/parser/parser.py
similarity index 100%
rename from opends/tests/system-tests/phases/parser/parser.py
rename to opends/tests/staf-tests/system-tests/phases/parser/parser.py
diff --git a/opends/tests/system-tests/phases/parser/parser.xml b/opends/tests/staf-tests/system-tests/phases/parser/parser.xml
similarity index 100%
rename from opends/tests/system-tests/phases/parser/parser.xml
rename to opends/tests/staf-tests/system-tests/phases/parser/parser.xml
diff --git a/opends/tests/system-tests/phases/scheduler/scheduler.py b/opends/tests/staf-tests/system-tests/phases/scheduler/scheduler.py
similarity index 100%
rename from opends/tests/system-tests/phases/scheduler/scheduler.py
rename to opends/tests/staf-tests/system-tests/phases/scheduler/scheduler.py
diff --git a/opends/tests/system-tests/phases/scheduler/scheduler.xml b/opends/tests/staf-tests/system-tests/phases/scheduler/scheduler.xml
similarity index 100%
rename from opends/tests/system-tests/phases/scheduler/scheduler.xml
rename to opends/tests/staf-tests/system-tests/phases/scheduler/scheduler.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/ldap.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/ldap.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/ldap.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/ldap.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/opendsadm.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/opendsadm.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/opendsadm.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/opendsadm.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/opendscfg.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/opendscfg.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/opendscfg.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/opendscfg.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/opendssecurity.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/opendssecurity.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/opendssecurity.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/opendssecurity.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/opendstools.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/opendstools.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/opendstools.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/opendstools.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/signals.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/signals.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/signals.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/signals.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/stafcmd.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/stafcmd.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/stafcmd.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/stafcmd.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/staxcmd.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/staxcmd.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/staxcmd.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/staxcmd.xml
diff --git a/opends/tests/system-tests/phases/shared/functions/utils.xml b/opends/tests/staf-tests/system-tests/phases/shared/functions/utils.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/functions/utils.xml
rename to opends/tests/staf-tests/system-tests/phases/shared/functions/utils.xml
diff --git a/opends/tests/system-tests/phases/shared/java/addAnEntry.class b/opends/tests/staf-tests/system-tests/phases/shared/java/addAnEntry.class
similarity index 100%
rename from opends/tests/system-tests/phases/shared/java/addAnEntry.class
rename to opends/tests/staf-tests/system-tests/phases/shared/java/addAnEntry.class
Binary files differ
diff --git a/opends/tests/system-tests/phases/shared/java/addAnEntry.java b/opends/tests/staf-tests/system-tests/phases/shared/java/addAnEntry.java
similarity index 100%
rename from opends/tests/system-tests/phases/shared/java/addAnEntry.java
rename to opends/tests/staf-tests/system-tests/phases/shared/java/addAnEntry.java
diff --git a/opends/tests/system-tests/phases/shared/java/modifyAnAttribute.class b/opends/tests/staf-tests/system-tests/phases/shared/java/modifyAnAttribute.class
similarity index 100%
rename from opends/tests/system-tests/phases/shared/java/modifyAnAttribute.class
rename to opends/tests/staf-tests/system-tests/phases/shared/java/modifyAnAttribute.class
Binary files differ
diff --git a/opends/tests/system-tests/phases/shared/java/modifyAnAttribute.java b/opends/tests/staf-tests/system-tests/phases/shared/java/modifyAnAttribute.java
similarity index 100%
rename from opends/tests/system-tests/phases/shared/java/modifyAnAttribute.java
rename to opends/tests/staf-tests/system-tests/phases/shared/java/modifyAnAttribute.java
diff --git a/opends/tests/system-tests/phases/verdict/verdict.xml b/opends/tests/staf-tests/system-tests/phases/verdict/verdict.xml
similarity index 100%
rename from opends/tests/system-tests/phases/verdict/verdict.xml
rename to opends/tests/staf-tests/system-tests/phases/verdict/verdict.xml
diff --git a/opends/tests/system-tests/report/clientDetails.xsl b/opends/tests/staf-tests/system-tests/report/clientDetails.xsl
similarity index 100%
rename from opends/tests/system-tests/report/clientDetails.xsl
rename to opends/tests/staf-tests/system-tests/report/clientDetails.xsl
diff --git a/opends/tests/system-tests/report/opends_logo_sm.png b/opends/tests/staf-tests/system-tests/report/opends_logo_sm.png
similarity index 100%
rename from opends/tests/system-tests/report/opends_logo_sm.png
rename to opends/tests/staf-tests/system-tests/report/opends_logo_sm.png
Binary files differ
diff --git a/opends/tests/system-tests/report/result.css b/opends/tests/staf-tests/system-tests/report/result.css
similarity index 100%
rename from opends/tests/system-tests/report/result.css
rename to opends/tests/staf-tests/system-tests/report/result.css
diff --git a/opends/tests/system-tests/report/result.xsl b/opends/tests/staf-tests/system-tests/report/result.xsl
similarity index 100%
rename from opends/tests/system-tests/report/result.xsl
rename to opends/tests/staf-tests/system-tests/report/result.xsl
diff --git a/opends/tests/system-tests/scenario/4MMR/4MMR.xml b/opends/tests/staf-tests/system-tests/scenario/4MMR/4MMR.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/4MMR.xml
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/4MMR.xml
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoad.xml b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoad.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoad.xml
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoad.xml
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadLib.xml b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadLib.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadLib.xml
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadLib.xml
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPostamble.xml b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPostamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPostamble.xml
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPreamble.xml b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPreamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/addDeleteLoadPreamble.xml
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/build.ksh b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/build.ksh
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/build.ksh
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/build.ksh
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/first.names b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/first.names
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/first.names
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/first.names
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/last.names b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/last.names
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/last.names
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/data/last.names
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/run.ksh b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/run.ksh
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/run.ksh
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/run.ksh
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Client.java b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Client.java
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Client.java
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Client.java
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/ExtendedRandom.java b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/ExtendedRandom.java
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/ExtendedRandom.java
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/ExtendedRandom.java
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Server.java b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Server.java
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Server.java
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Server.java
diff --git a/opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Worker.java b/opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Worker.java
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Worker.java
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/clients/addDeleteLoad/src/Worker.java
diff --git a/opends/tests/system-tests/scenario/4MMR/conf.xml b/opends/tests/staf-tests/system-tests/scenario/4MMR/conf.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/4MMR/conf.xml
rename to opends/tests/staf-tests/system-tests/scenario/4MMR/conf.xml
diff --git a/opends/tests/system-tests/scenario/conf.dtd b/opends/tests/staf-tests/system-tests/scenario/conf.dtd
similarity index 100%
rename from opends/tests/system-tests/scenario/conf.dtd
rename to opends/tests/staf-tests/system-tests/scenario/conf.dtd
diff --git a/opends/tests/system-tests/scenario/sample/conf.xml b/opends/tests/staf-tests/system-tests/scenario/sample/conf.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample/conf.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample/conf.xml
diff --git a/opends/tests/system-tests/scenario/sample/sample.xml b/opends/tests/staf-tests/system-tests/scenario/sample/sample.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample/sample.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample/sample.xml
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/run.sh b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/run.sh
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/run.sh
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/run.sh
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadLib.xml b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadLib.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadLib.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadLib.xml
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPostamble.xml b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPostamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPostamble.xml
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPreamble.xml b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPreamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoadPreamble.xml
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Client.java b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Client.java
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Client.java
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Client.java
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Server.java b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Server.java
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Server.java
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Server.java
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Worker.java b/opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Worker.java
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Worker.java
rename to opends/tests/staf-tests/system-tests/scenario/sample2/clients/sampleSearchLoad/src/Worker.java
diff --git a/opends/tests/system-tests/scenario/sample2/conf.xml b/opends/tests/staf-tests/system-tests/scenario/sample2/conf.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/conf.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample2/conf.xml
diff --git a/opends/tests/system-tests/scenario/sample2/post_configuration.xml b/opends/tests/staf-tests/system-tests/scenario/sample2/post_configuration.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/post_configuration.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample2/post_configuration.xml
diff --git a/opends/tests/system-tests/scenario/sample2/pre_configuration.xml b/opends/tests/staf-tests/system-tests/scenario/sample2/pre_configuration.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/pre_configuration.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample2/pre_configuration.xml
diff --git a/opends/tests/system-tests/scenario/sample2/sample2.xml b/opends/tests/staf-tests/system-tests/scenario/sample2/sample2.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/sample2/sample2.xml
rename to opends/tests/staf-tests/system-tests/scenario/sample2/sample2.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/build.ksh b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/build.ksh
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/build.ksh
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/build.ksh
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/run.ksh b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/run.ksh
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/run.ksh
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/run.ksh
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntries.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntries.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntries.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntries.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesLib.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesLib.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesLib.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesLib.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPostamble.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPostamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPostamble.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPreamble.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPreamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/secureModifyEntriesPreamble.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Client.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Server.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Server.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Server.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Server.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Worker.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Worker.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Worker.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureModifyEntries/src/Worker.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/build.ksh b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/build.ksh
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/build.ksh
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/build.ksh
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/run.ksh b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/run.ksh
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/run.ksh
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/run.ksh
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.jar b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.jar
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.jar
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.jar
Binary files differ
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearch.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchLib.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchLib.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchLib.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchLib.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPostamble.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPostamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPostamble.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPreamble.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPreamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/secureSearchPreamble.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/src/Client.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Client.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/src/Client.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Client.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/src/Server.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Server.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/src/Server.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Server.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureSearch/src/Worker.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Worker.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureSearch/src/Worker.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureSearch/src/Worker.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/build.ksh b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/build.ksh
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/build.ksh
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/build.ksh
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/run.ksh b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/run.ksh
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/run.ksh
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/run.ksh
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModify.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModify.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModify.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModify.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyLib.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyLib.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyLib.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyLib.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPostamble.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPostamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPostamble.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPreamble.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPreamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/secureUserpasswordModifyPreamble.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Client.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Server.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Server.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Server.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Server.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Worker.java b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Worker.java
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Worker.java
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/secureUserpasswordModify/src/Worker.java
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasks.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasksLib.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksLib.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/tasks/tasksLib.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksLib.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasksPostamble.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksPostamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/tasks/tasksPostamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksPostamble.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/clients/tasks/tasksPreamble.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksPreamble.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/clients/tasks/tasksPreamble.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/clients/tasks/tasksPreamble.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/conf.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/conf.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/conf.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/conf.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/data/99_ext_schema.ldif b/opends/tests/staf-tests/system-tests/scenario/singleServer/data/99_ext_schema.ldif
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/data/99_ext_schema.ldif
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/data/99_ext_schema.ldif
diff --git a/opends/tests/system-tests/scenario/singleServer/post_configuration.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/post_configuration.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/post_configuration.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/post_configuration.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/pre_configuration.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/pre_configuration.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/pre_configuration.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/pre_configuration.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/security_lib.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/security_lib.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/security_lib.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/security_lib.xml
diff --git a/opends/tests/system-tests/scenario/singleServer/single.xml b/opends/tests/staf-tests/system-tests/scenario/singleServer/single.xml
similarity index 100%
rename from opends/tests/system-tests/scenario/singleServer/single.xml
rename to opends/tests/staf-tests/system-tests/scenario/singleServer/single.xml

--
Gitblit v1.10.0