From a2687b4026f4c5679d9ac359e8ef62be4948d05d Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Mon, 17 Jul 2006 17:44:59 +0000
Subject: [PATCH] Added copyright header to all data files used by the integration tests.
---
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in_2nd.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_trust_mgr_provider.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out_2nd.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/jks_startup.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn_2nd.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/deleteTrustMgr.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_key_mgr_provider.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/shutdown/disable_TLS.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01 | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_TLS.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod_2nd.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_ldaps_conn_handler.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod_2nd.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in_2nd.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif | 25
/dev/null | 8
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out_2nd.ldif | 25
opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif | 25
203 files changed, 5,050 insertions(+), 8 deletions(-)
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif
index 045245f..bf5e17a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/backend_start.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=backend tests,dc=example,dc=com
o: backend tests
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif
index 9c342ab..2035911 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/branchTestAdd.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=branch test seven, o=import tests, dc=example,dc=com
objectclass: top
objectclass: organization
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01
index 8447c4c..45a25e6 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.01
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: dc=example,dc=com
dc: com
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02
index 64f624b..0c8bfbe 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.02
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=test two, o=import tests, dc=example,dc=com
objectclass: top
objectclass: organization
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03
index 947d2ce..b12c9cd 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.03
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden3, ou=People, o=test one, o=import tests, dc=example,dc=com
cn: Torrey Rigden3
sn: Rigden3
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04
index 8ee8d17..382ff81 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.04
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden4, ou=People, o=test one, o=import tests, dc=example,dc=com
cn: Torrey Rigden4
sn: Rigden4
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05
index b072560..8f6dc58 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.05
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden5, ou=People, o=test one, o=import tests, dc=example,dc=com
cn: Torrey Rigden5
sn: Rigden5
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06
index 747abb3..379634e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.06
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden6, ou=People, o=test one, o=import tests, dc=example,dc=com
cn: Torrey Rigden6
sn: Rigden6
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07
index 1c81456..64826f2 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.07
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden7, ou=People, o=test one, o=import tests, dc=example,dc=com
cn: Torrey Rigden7
sn: Rigden7
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08
index 710be04..c150702 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.08
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden8, ou=People, o=test one, o=import tests, dc=example,dc=com
cn: Torrey Rigden8
sn: Rigden8
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09
index 69dcb8f..2b7d293 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.09
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden9, ou=People, o=test one, o=import tests, dc=example,dc=com
cn: Torrey Rigden9
sn: Rigden9
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10
index e00be99..e45f34e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.10
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=branch test one, o=import tests, dc=example,dc=com
objectclass: top
objectclass: organization
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11
index cad27ee..fc36e54 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.11
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=branch test three, o=import tests, dc=example,dc=com
objectclass: top
objectclass: organization
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12
index e4e8848..c11e0da 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.12
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=branch test five, o=import tests, dc=example,dc=com
objectclass: top
objectclass: organization
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13 b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13
index f1d917c..5c9dd81 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import.ldif.13
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=branch test seven, o=import tests, dc=example,dc=com
objectclass: top
objectclass: organization
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif
index 5f04bb2..4dbdcfe 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/import_task.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=import tasks tests, dc=example,dc=com
objectclass: top
objectclass: organization
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif
index 2850087..22fed26 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris,ou=People,o=backend tests,dc=example,dc=com
changetype: modify
replace: l
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif
index a4e8c39..84f8519 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/backend/data/mods2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris,ou=People,o=backend tests,dc=example,dc=com
changetype: modify
replace: l
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif
index a510c99..31f8fc0 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/all.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif
index 22d83dd..dd2dfeb 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif
index 869b9db..7e7624b 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a1_in_bad.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, c=Canada, dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif
index 5c1f0e9..287b5bb 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif
index 19413f5..63a6a72 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a3_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif
index 6fc5c3e..a881ce1 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_a4_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif
index c638eda..ff9554f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bscharp, ou=People, o=bob tests,dc=example,dc=com
cn: Ben Scharp
sn: Scharp
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif
index 8c59a12..86c25cb 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bsmith, ou=People, o=bob tests,dc=example,dc=com
cn: Bob Smith
sn: Smith
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif
index a6cd0dd..d181965 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b3_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bscharp, ou=People, o=bob tests,dc=example,dc=com
cn: Ben Scharp
sn: Scharp
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif
index 2ff98b9..101efe3 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_b4_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bsmith, ou=People, o=bob tests,dc=example,dc=com
cn: Bob Smith
sn: Smith
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif
index e12877a..c8fff24 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=kvaughan, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif
index 641508f..1bb3833 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif
index 82546f6..0383af6 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c3_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=kvaughan, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif
index b15e619..9e4a7a3 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_c4_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif
index 11a4b4d..c932ca2 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo1, ou=People, o=bob tests,dc=example,dc=com
cn: foo 1
sn: 1
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif
index cd636fa..879c7ad 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo6, ou=People, o=bob tests,dc=example,dc=com
cn: foo 6
sn: 6
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif
index 21865c0..cf79e93 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d3_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo1, ou=People, o=bob tests,dc=example,dc=com
cn: foo 1
sn: 1
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif
index a241a4f..f0d91c0 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/bin_d4_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo6e, ou=People, o=bob tests,dc=example,dc=com
cn: foo 6e
sn: 6e
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif
index 643ee6c..1314373 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=rdaugherty, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: labeleduri
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif
index 521e7ae..fb0cf58 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_a2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jreuter, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: labeleduri
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif
index 30b11df..d58fb1c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo11, ou=People, o=bob tests,dc=example,dc=com
cn: foo 11
sn: 11
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif
index b872e85..ff4c652 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_b2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo12, ou=People, o=bob tests,dc=example,dc=com
cn: foo 12
sn: 12
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif
index 6c7a091..928831d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmason, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: labeleduri
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif
index 7de59a8..1e94d44 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_c2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jmcFarla, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: labeleduri
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif
index db6bff8..2edd319 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo13, ou=People, o=bob tests,dc=example,dc=com
cn: foo 13
sn: 13
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif
index f9674d8..3eb5cba 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/ces_d2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo18, ou=People, o=bob tests,dc=example,dc=com
cn: foo 18
sn: 18
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif
index 6e22202..022bbf2 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif
index 31fd70e..1a4112b 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=achassin, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif
index 378fd99..6c478ea 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a3_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif
index ce85eae..b2603bf 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_a4_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif
index d319c3c..7335460 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo23, ou=People, o=bob tests,dc=example,dc=com
cn: foo 23
sn: 23
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif
index d05c4cc..f3b26f7 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo24, ou=People, o=bob tests,dc=example,dc=com
cn: foo 24
sn: 24
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif
index 0033f43..439cf9d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b3_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo23, ou=People, o=bob tests,dc=example,dc=com
cn: foo 23
sn: 23
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif
index 9e4a9a4..8960d04 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_b4_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo23, ou=People, o=bob tests,dc=example,dc=com
cn: foo 23
sn: 23
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif
index 2e1f7e1..3c28119 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif
index 8b6e13a..80d4b53 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=striplet, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif
index 11cbac3..5e17279 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c3_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif
index df86df6..c3ff234 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_c4_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
add: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif
index 37b7b4f..8177111 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo25, ou=People, o=bob tests,dc=example,dc=com
cn: foo 25
sn: 25
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif
index 9045faf..bd8e281 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo30, ou=People, o=bob tests,dc=example,dc=com
cn: foo 30
sn: 30
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif
index cb18ab3..b9b95e7 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d3_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo25, ou=People, o=bob tests,dc=example,dc=com
cn: foo 25
sn: 25
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif
index a25f92e..af7983d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/cis_d4_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo30e, ou=People, o=bob tests,dc=example,dc=com
cn: foo 30e
sn: 30e
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif
index 3ff2ed9..f823de4 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bschneid, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
add: seeAlso
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif
index a9a68f8..4ac9e86 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_a2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=skellehe, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
add: seeAlso
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif
index 0d91a8b..fd69aed 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo47, ou=people, o=bob tests,dc=example,dc=com
cn: foo 47
sn: 47
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif
index 99c84da..35686aa 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_b2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo48, ou=people, o=bob tests,dc=example,dc=com
cn: foo 48
sn: 48
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif
index dc9a95a..e1cef65 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=brentz, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
add: seeAlso
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif
index 21addc8..df03733 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_c2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=lcampbel, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
add: seeAlso
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif
index cdd29a8..4cb1488 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo49, ou=people, o=bob tests,dc=example,dc=com
cn: foo 49
sn: 49
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif
index ce6fe51..431066a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/dn_d2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo54, ou=people, o=bob tests,dc=example,dc=com
cn: foo 54
sn: 54
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif
index 1167b80..90ecd42 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jfalena, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
add: pager
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif
index 1f4d1a0..848bb58 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_a2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=speterso, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
add: pager
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif
index fd926af..846a750 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo35, ou=People, o=bob tests,dc=example,dc=com
cn: foo 35
sn: 35
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif
index 9f33e75..5e2ec2d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_b2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo36, ou=People, o=bob tests,dc=example,dc=com
cn: foo 36
sn: 36
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif
index fc18fbf..d8e707b 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=ejohnson, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
add: pager
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif
index 048d3dd..b921dd2 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_c2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=cwallace, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
add: pager
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif
index ceae3ed..9a9c5c3 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo37, ou=People, o=bob tests,dc=example,dc=com
cn: foo 37
sn: 37
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif
index 3c5093b..8396d51 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/add/tel_d2_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=foo42, ou=People, o=bob tests,dc=example,dc=com
cn: foo 42
sn: 42
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif
index 9df501a..fbf6c6f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a1_out.ldif
@@ -1,2 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
changetype: delete
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif
index e0f26b2..f58696c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a2_out.ldif
@@ -1,2 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bad, ou=People, o=bob tests,dc=example,dc=com
changetype: delete
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif
index c3c8c0d..a04a2e5 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a3_out.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=pshelton,ou=People,o=bob tests,dc=example,dc=com
changetype: delete
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif
index 63bacd2..e966c78 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a4_out.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmason, ou=People, o=bob tests,dc=example,dc=com
changetype: delete
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif
index bf202ea..884c5f9 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/del/a5_out.ldif
@@ -1,2 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
uid=jreuter, ou=People, o=bob tests,dc=example,dc=com
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif
index 1cf797b..41422b7 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif
index 208db84..555be37 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif
index da2036f..1c1d602 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a3_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif
index cc85349..8568685 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_a4_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif
index 1cb3b4c..7906897 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=kvaughan, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif
index afcc4c8..365ad6a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif
index 3b39959..3bf7205 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c3_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=kvaughan, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif
index 351830e..2a38da6 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/bin_c4_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif
index 3a4ad97..9472606 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=rdaugherty, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: labeleduri
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif
index 111ce58..f55d3ba 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_a2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jreuter, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: labeleduri
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif
index 2c68e5a..216f7f1 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmason, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: labeleduri
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif
index 20bd6d4..d24ec42 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/ces_c2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jmcFarla, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: labeleduri
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif
index 093a62e..2aa7b5f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif
index 64310e0..9399d4e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=achassin, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif
index f6f83f1..679361e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a3_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=btalbo2, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif
index 424ad9b..8150986 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_a4_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=achassin, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif
index 21d191a..80e8e55 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif
index 8e3ad60..526a0c4 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=gtriplet, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif
index f133a21..55d250d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c3_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif
index e780176..3011f1c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/cis_c4_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=hmiller, ou=People, o=bob tests,dc=example,dc=com
changetype: modify
replace: description
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif
index 0845d6b..201b0f3 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bschneid, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: seeAlso
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif
index 20422cb..6f25b3a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_a2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=skellehe, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: seeAlso
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif
index b969137..4cba7ea 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=brentz, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: seeAlso
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif
index 4ea0169..d983a12 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/dn_c2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=lcampbel, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: seeAlso
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif
index 6487d15..60d4f2b 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jfalena, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: pager
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif
index 8a06811..0ed39df 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_a2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=speterso, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: pager
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif
index 5d2a68a..070630f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=ejohnson, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: pager
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif
index bbf6f0f..3aba595 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/mod/tel_c2_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=cwallace, ou=people, o=bob tests,dc=example,dc=com
changetype: modify
replace: pager
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif
index 38276c7..2d2b34c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn:uid=prose, ou=people, o=bob tests,dc=example,dc=com
changetype: modrdn
newrdn: uid=thisisaminoradjustment
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif
index 10f602a..f34c763 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a1_modrdn_old.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn:uid=prose, ou=people, o=bob tests,dc=example,dc=com
changetype: modrdn
newrdn: uid=thisisaminoradjustment
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif
index c926040..ee13dbd 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a2_modrdn.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn:uid=jhunter, ou=people, o=bob tests,dc=example,dc=com
changetype: modrdn
newrdn: uid=rumJZ2l5Fa65EzOtvcSbVvI2PylGPAIxjHQ9c0Kpyu72IznDRRSruxy94uuaA9zpMj3dsAwM9m7EAkcg4AHPpXQuWXvGHvR0T0NaMNHYR3FzbyqJASkyopDD1D87Wz14HHzYJIrn62Tr0rt0OtP3btf1698AhyzIbu3hQ6jPaJtXbB5dtHKJm6fMwGSOepDZJx6000huJqUdZW/B3KbRW7RKhsTKCwEp3iKRjjOQvODzgEZBwOOaq73uTZbWRk8eoLBbu9pYiGwt22NLdFhcNn7yAxlSwxjOePUruAo5W3avltIKfKtFou4E63tha2snkpNcs4OIxcM1t5fLDEZG7K5JxvBB5yamzb14P9P01HdRWmv5f0vvRHqOo3EGG1AhrdWZIIUUeVbnAIc7f4sNuHA5J68iuhWbtHhxzm46yXZeZi3N7brJHiyMcDxn51BBZcOCSTngZ9eaq1upi5JW93TtSVWEl39ouL0PIuRubcgLdSMkEA885GOeeVrayRSte7ZM9vNDGVuLaOJZWzDKyE57YEh42gcHsOw6mlfqh8rWjX9epVlaUxYrVIRHJglhsyuDfIyB3x
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif
index bb242c5..0da79d6 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/modrdn/a3_modrdn.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=ashelton, ou=people, o=bob tests,dc=example,dc=com
changetype: modrdn
newrdn: uid=9jg4AAQSkZJRgABAQAAAQABAAD2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkS w8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDLwAALCAJnB7oBAREA8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4Tl5ufo6erx8vP09fb3Pn69oACAEBAAAAPniiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiloopKWkpaKKSloxRilxRgUu0elAUelLtHpShR6UFF7CgIPSl2rdoCDPSnCNc9BSUvpTkiUsAEBzVpbaHZkxj0JqIxorEBFI3av6bpsVzITNGBEoJZiMBR61VubeGKQBAhBH3euPxqqFUP8AdXH6K07aGG5ZT9njP8ACflABHr9asXOmW8chxbrswMN07fp3q5YaHaXgx9lXJ5B3YGP896W607Ror5YUtV8kJtaXzDgNt9wB9Vmy2lgCVjVHCA5bnLf8A1qS2toGcKbaNl6s2326VFPBbJOVjhTA7kUqQRhSnlRBWOclATn69qUQwhSDDHuzydoPFOtbS2nl8pok56EL0qa6021geM7AEJwRtB6VBNbWvmnyok2YHb296j8iHnknfNOWCIjb5UeM3BUwt7ZYmJgjPHHyjPWpPstsmFNvGWxk5UdTQljbyRsTAn38DC47VObWzQjfaQhgeSBkMeO3YfpxinjTrU7SbeHLHaAFz6Ups7MMcWkOO2UFILK1Z1LW8O3I3YjHT8qkSws3kLfY4xGg5PljBJPC57cZP4VJ9mtoMW3sbUGTgB4VfB9csDjvVh7KzlgSX7HCsMOIppUt03uXgAYGegz2wcE9bb6LYCBLg6fbxp80X3VJZlOC2enX0qLxtMb5vsUPI7Ln1qzDpunLsQWFocAj5oUJxIJP1lVlNG01iudPtOvP7lP8KiGkWNxqcFtHZWMEMxMYka3BIYdTjH1wO5A5xmtSLQtHWJo1020mmC8F7dUDckZ6cf0qeHwxpflAvptjJLABKIFC59uM4tWk8N6Gcx7IgnJcLAIUw8M6M1mksmj2Dkzy5H2dDhQW2A3C89eatWnhLS8LHc6NpnmtErjFqpUHA3Z4HRj9MfjV2z8GaKDEk2n6ZI2N7H7DEM8AccdOCe3vpi3gfQJorgLomm5ZGC6IgYE9BkAADHpzz1qS38EeGdPshJNo2myuCqsv2VHGc9MkZ7pVrTAAp4bub638nw7pPkMSXD2EJJGOoyvAyf0PrPEB8IPGAfCig46jT4viaZceCvCUKoE8JaC7E4INjCpx0z931IOooPCXgySCeRPCWjOYXZHVNOiY7h1AXnIpZPCXg1JhBwiehrKwG0Np8Hfpxjnvx7GpoPAvhMxZk8K6GWyf8AmGxDvu1LwgngAKFTQ8AwXQE0f8IJ4QzyKmhC6HwCJo4QTwfANCpof8A4LofiaIKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKWkopaSiiiiiiilopKKKWkpaSilpKWiiiikoopaKKKKKKKKKKKWlpaQU4UYpaM5pwGQeaQH0p45FCexUOKXtWgxESjr6e1PtLR55VbB2FsFsZ5qe9kYTXECECgEdxnNZszcKCcv3PtTERndVAyScCuk0rT2guYxt3OzZzgEtgj9ce3X0qfxJKY2nEbAebLhkCnAI747UW6ix0GJZ9kN1I4AnMhjx9eAffr1HeqF0QbcucoCOFx2AFj9aoIQkRQqQXOS3tnNWPOAgJRdvAXI9hUByTnknrmpUwcbyeVJGO3cVPLbqgLLxnnDHtSQr5SzSbjt2bVI4OeMVLxNaq8knCD7pPLHvVAthif0pVGfxqaFNzYH1zOBUu0GTaCMIMnA6474PqcfnSgE5JPJPNWIGVn2EZAYjtgfqNK7h5iEByVLgj0JxztPRWXaWOcsByfp9enN88jEcAcn4Uw7mIjjGZX4UeFWSnkgQhtxH3scgvjBI9uP0prEIu4sVywViOuMgkD3ratYEgtH328rwlNeHALkYwOhOAR2xwaYkm94rcnbHGpcouTgE569ssep9aSXO7IYhB2Ayf89O3rUlsCHeZlAYDZ3JUcHHt78f8A17sJJO2QMCScDBBAx19qtxja4C8EEkH36VcUOZckjZtXIRjA7daquovtSOnK5Hnx5lJGQsfI49ycjOa6JRDagxphY4yAfTIAH9KQzwtdr1ErqE3L1C5zApWvGh1SKOPlA25huGCT8uDPNdBaTNcCR5ASAfLAY4x0Jx9c81okJOqwsQdK4OCw9v8abJY2tuyCXDiRtvlsSdwx0I9ODV2bbLFCsNxcShsI6RSlFjXOcDbjp69cDHc1FrqsbeW2hspZ55rV20LEJBg549WI7Dp074qt4Zt9XhsLRkIuIZYhLK7sMSl8H3yQOpAGSSecmuuht4oC5jXBcgsc9SAAP0ApjswnMZkDeYMLGOCBxk5HTvlSRRCIBVZyoGAGYtOTz1kBZGyMkfiDgqKdXwBRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS0lFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFLSUUUUUUUUUUUUUtJRS0lLRS
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif
index 49f1d8f..9a933e8 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/data/setup/bob_start.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=bob tests,dc=example,dc=com
o: bob tests
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif
index d93aa12..feec938 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_start.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=core tests,dc=example,dc=com
o: core tests
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif
index f8cdfab..154aa87 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/core_test_1K.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: ou=North America,o=core tests,dc=example,dc=com
objectclass: top
objectclass: organizationalUnit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif
index 7aaa021..d099c6c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Entry Cache,cn=config
changetype: modify
replace: ds-cfg-entry-cache-enabled
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif
index 155e78f..1234275 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Entry Cache,cn=config
changetype: modify
add: ds-cfg-lock-timeout
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif
index 030085b..3bd1f39 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache4.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Entry Cache,cn=config
changetype: modify
add: ds-cfg-max-entries
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif
index 2d6b70c..249e6bd 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_entrycache5.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Entry Cache 2,cn=config
cn: Entry Cache 2
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif
index 64deb27..b357e2a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=config
changetype: modify
replace: ds-cfg-size-limit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif
index e3cdb60..8be234e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=config
changetype: modify
replace: ds-cfg-size-limit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif
index 55cc0c2..1c72d82 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Directory Manager,cn=Root DNs,cn=config
changetype: modify
replace: ds-rlim-size-limit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif
index e80dba9..77e9578 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_searchsizelimit4.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Directory Manager,cn=Root DNs,cn=config
changetype: modify
replace: ds-rlim-size-limit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif
index 4e3b728..4c9c0f1 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=config
changetype: modify
replace: ds-cfg-time-limit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif
index 6fda34a..f22a7d9 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=config
changetype: modify
replace: ds-cfg-time-limit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif
index 0d4a5b6..a881375 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Directory Manager,cn=Root DNs,cn=config
changetype: modify
replace: ds-rlim-time-limit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif
index 1a6b65f..7674a81 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/data/mod_timelimit4.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Directory Manager,cn=Root DNs,cn=config
changetype: modify
replace: ds-rlim-time-limit
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif
index 758456f..457c2d1 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/frontend_start.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=frontend tests,dc=example,dc=com
o: frontend tests
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif
index 922deac..f2ddb84 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter,ou=People,o=frontend tests,dc=example,dc=com
changetype: modify
add: st
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif
index 671d059..97c80eb 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris, ou=People, o=frontend tests,dc=example,dc=com
changetype: modify
delete: mail
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif
index 51449a0..939c0ae 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=kvaughan, ou=People, o=frontend tests,dc=example,dc=com
changetype: modify
replace: l
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif
index fdbb751..902ef00 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_4.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=kvaughan, ou=People, o=frontend tests,dc=example,dc=com
changetype: modify
replace: st
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif
index 4f398f2..9bc2f6c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_5.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=abergin, ou=People, o=frontend tests,dc=example,dc=com
changetype: modify
replace: mail
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif
index 775745f..6766f69 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_6.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=dmiller, ou=People, o=frontend tests,dc=example,dc=com
changetype: modify
replace: st
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif
index 89a1d43..00a3fc6 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/mod/mod_7.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=dmiller, ou=People, o=frontend tests,dc=example,dc=com
changetype: modify
delete: uid
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif
index 60b7403..64e8c9a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=gfarmer, ou=People, o=frontend tests,dc=example,dc=com
changetype: modrdn
newrdn: uid=gfarmersmith
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif
index dc69a33..0def0d0 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=kwinters, ou=People, o=frontend tests,dc=example,dc=com
changetype: modrdn
newrdn: uid=kwinterssmith
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif
index 467d8c6..b38f3af 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=badname, ou=People, o=frontend tests,dc=example,dc=com
changetype: modrdn
newrdn: uid=anotherbadname
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif
index 354b597..ebac665 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/modrdn/modrdn_4.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=trigden, ou=People, o=frontend tests,dc=example,dc=com
changetype: modrdn
newrdn: uid=jwallace
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif
index 6c5e556..79dd6a8 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jreuter,ou=People,o=frontend tests,dc=example,dc=com
changetype: modify
add: st
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif
index 9bc738d..0aa9b0d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/data/standards/standards_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jreuter,ou=People,o=frontend tests,dc=example,dc=com
changetype: modify
replace: st
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif
index f3483f9..5f366ab 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/data/quickstart.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: dc=example,dc=com
dc: example
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif
index 012fa8f..dfce7ba 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: changenumber=100001,o=changelog tests,dc=example,dc=com
objectclass: top
objectclass: changeLogEntry
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif
index 8372d32..938243c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: changenumber=100002,o=changelog tests,dc=example,dc=com
objectclass: top
objectclass: changeLogEntry
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif
index 75dafb9..170c007 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/changelog_3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: changenumber=100003,o=changelog tests,dc=example,dc=com
objectclass: top
objectclass: changeLogEntry
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif
index a74ef59..b03ed0f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_schema_checking.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=config
changetype: modify
replace: ds-cfg-check-schema
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif
index 817074d..c029349 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/disable_syntax_checking.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Generalized Time,cn=Syntaxes,cn=config
changetype: modify
replace: ds-cfg-syntax-enabled
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif
index 17d5c65..74a0bd8 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_schema_checking.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=config
changetype: modify
replace: ds-cfg-check-schema
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif
index bc8d1b8..96550f3 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/enable_syntax_checking.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Generalized Time,cn=Syntaxes,cn=config
changetype: modify
replace: ds-cfg-syntax-enabled
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif
index 6ffae11..a58213d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: documentIdentifier=ldap cosine 1,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: document
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif
index 8a72f3a..e9a7913 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=new author,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: document
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif
index a832273..b54d79b 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldap_cosine_3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=another new author,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: document
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif
index 1488398..9fec20a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=ldup subentry 1,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: ldapSubEntry
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif
index 9ddf447..29fde86 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=ldup subentry 2,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: ldapSubEntry
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif
index 4c72ed1..4643676 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/ldup_subentry_3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=ldup subentry 3,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: ldapSubEntry
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif
index 4f2ce86..ce0bd0f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=named object,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: namedObject
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif
index c73d07a..db22ba8 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/namedobject_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=named object 2,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: namedObject
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif
index eebc0a4..b86cf6d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2079.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=mmiller, ou=People, o=rfc tests,dc=example,dc=com
cn: Mort Miller
sn: Miller
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif
index d227d7d..029a630 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: dc=rfc-2247-tests,dc=example,dc=com
dc: rfc-2247-tests
o: Crucial RFC Tests
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif
index fef0ae4..3360413 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: dc=rfc-2247-tests-2,dc=example,dc=com
dc: rfc-2247-tests-2
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif
index cbe3ca8..e66ec79 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: dc=rfc-2247-tests-3,dc=example,dc=com
dc: rfc-2247-tests-3
o: Crucial RFC Tests
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif
index 74d76cd..3e2f35c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_4.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: dc=rfc-2247-tests-4,dc=example,dc=com
dc: rfc-2247-tests-4
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif
index 290ccec..8b4b61e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2247_5.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: dc=rfc-2247-tests-5,dc=example,dc=com
dc: rfc-2247-tests-5
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif
index 97ce4e7..b49ec62 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=server 101,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: ipHost
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif
index c2def23..070b6c8 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=server 102,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: ipHost
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif
index 761eaf1..770db22 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=printer 103,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: ipHost
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif
index 24ca61b..4ca9d56 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2307bis_4.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=printer 104,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: ipHost
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif
index a4c7954..4503870 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2377.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: dc=rfc-2377-tests,dc=example,dc=com
dc: rfc-2377-tests
o: Crucial RFC Tests
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif
index 9a2540a..cf7065c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc2798.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bmorris, ou=People, o=rfc tests,dc=example,dc=com
cn: Bucky Morris
sn: Morris
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif
index f35b288..b029593 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn:
changetype: modify
add: vendorName
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif
index a027cff..e7ec6bd 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc3045_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn:
changetype: modify
add: vendorVersion
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif
index 2264747..18e053c 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_1.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: ou=uddi tests,o=rfc tests,dc=example,dc=com
ou: uddi tests
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif
index 7936bee..adbd30a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_2.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uddiServiceKey=ldap service,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: uddiBusinessService
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif
index 0372236..a016495 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_3.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uddiServiceKey=bad service dn,ou=uddi tests,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: uddiBusinessService
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif
index 4344525..03b06e1 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_4.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uddiUUID=4001,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: uddiContact
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif
index 10ea78d..98c78ac 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_5.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uddiUUID=5001,ou=uddi tests,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: uddiContact
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif
index 52bc133..1b00779 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_6.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uddiUUID=6001,uddiBusinessKey=biz,ou=uddi tests,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: uddiAddress
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif
index 1a8f428..98399cc 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/rfc4403_7.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uddiUUID=7001,ou=uddi tests,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: uddiAddress
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif
index 99cf07e..d31c4bc 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/schema_start.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=extensible object tests,dc=example,dc=com
o: extensible object tests
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif
index 811a70c..0ef29b9 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/data/untypedobject.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=untyped object,o=rfc tests,dc=example,dc=com
objectclass: top
objectclass: untypedObject
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/JKSStartupTests.java.save b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/JKSStartupTests.java.save
deleted file mode 100644
index 124ea4f..0000000
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/JKSStartupTests.java.save
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Portions Copyright 2006 Sun Microsystems, Inc.
- */
-package org.opends.server.integration.ssl.jks;
-
-import static org.testng.Assert.*;
-import org.testng.annotations.Configuration;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import org.testng.annotations.ExpectedExceptions;
-import org.opends.server.tools.*;
-
-/**
- * This class contains the JUnit tests for the SSL JKS startup.
- */
-@Test
-public class JKSStartupTests extends JKSTests
-{
-/**
- * Setup for jks tests
-*/
- @Parameters({ "integration_test_home", "dsee_home", "logDir" })
- @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.schema.SchemaStartupTests.testSchemaStartup1" })
- public void testJKSStartup1(String integration_test_home, String dsee_home, String logDir) throws Exception
- {
- System.out.println("*********************************************");
- System.out.println("JKS SSL Startup test 1");
-
- ds_output.redirectOutput(logDir, "JKSStartup1.txt");
-
- String exec_cmd = "cd " + integration_test_home;
- Runtime rtime = Runtime.getRuntime();
- Process child = rtime.exec(exec_cmd);
- child.waitFor();
-
- exec_cmd = integration_test_home + "/ssl/jks/generate_server_cert.sh";
- rtime = Runtime.getRuntime();
- child = rtime.exec(exec_cmd);
- child.waitFor();
-
- exec_cmd = "cp " + "keystore " + dsee_home + "/config";
- rtime = Runtime.getRuntime();
- child = rtime.exec(exec_cmd);
- child.waitFor();
-
- exec_cmd = "cd " + dsee_home;
- rtime = Runtime.getRuntime();
- child = rtime.exec(exec_cmd);
- child.waitFor();
-
- ds_output.resetOutput();
-
- compareExitCode(0, 0);
- }
-
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
- @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.ssl.jks.JKSStartupTests.testJKSStartup1" })
- public void testJKSStartup2(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
- {
- System.out.println("*********************************************");
- System.out.println("JKS SSL Startup test 2");
- String datafile = integration_test_home + "/ssl/jks/data/startup/enable_key_mgr_provider.ldif";
- String jks_mod_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
-
- ds_output.redirectOutput(logDir, "JKSStartup2.txt");
- int retCode = LDAPModify.mainModify(jks_mod_args);
- ds_output.resetOutput();
- int expCode = 0;
-
- compareExitCode(retCode, expCode);
- }
-
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
- @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.ssl.jks.JKSStartupTests.testJKSStartup2" })
- public void testJKSStartup3(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
- {
- System.out.println("*********************************************");
- System.out.println("JKS SSL Startup test 3");
- String datafile = integration_test_home + "/ssl/jks/data/startup/enable_trust_mgr_provider.ldif";
- String jks_mod_args[] = {"-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
-
- ds_output.redirectOutput(logDir, "JKSStartup3.txt");
- int retCode = LDAPModify.mainModify(jks_mod_args);
- ds_output.resetOutput();
- int expCode = 0;
-
- compareExitCode(retCode, expCode);
- }
-
- @Parameters({ "hostname", "port", "bindDN", "bindPW", "integration_test_home", "logDir" })
- @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.ssl.jks.JKSStartupTests.testJKSStartup3" })
- public void testJKSStartup4(String hostname, String port, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
- {
- System.out.println("*********************************************");
- System.out.println("JKS SSL Startup test 4");
- String datafile = integration_test_home + "/ssl/jks/data/startup/enable_ldaps_conn_handler.ldif";
- String jks_add_args[] = {"-a", "-h", hostname, "-p", port, "-D", bindDN, "-w", bindPW, "-f", datafile};
-
- ds_output.redirectOutput(logDir, "JKSStartup4.txt");
- int retCode = LDAPModify.mainModify(jks_add_args);
- ds_output.resetOutput();
- int expCode = 0;
-
- compareExitCode(retCode, expCode);
- }
-
- @Parameters({ "hostname", "sport", "bindDN", "bindPW", "integration_test_home", "logDir" })
- @Test(alwaysRun=true, dependsOnMethods = { "org.opends.server.integration.ssl.jks.JKSStartupTests.testJKSStartup4" })
- public void testJKSStartup5(String hostname, String sport, String bindDN, String bindPW, String integration_test_home, String logDir) throws Exception
- {
- System.out.println("*********************************************");
- System.out.println("JKS SSL Startup test 5");
- String jks_test_search_args[] = {"-h", hostname, "-p", sport, "-D", bindDN, "-w", bindPW, "-Z", "-X", "-b", "dc=com", "-s", "base", "\'(objectclass=*)\'"};
-
- ds_output.redirectOutput(logDir, "JKSStartup5.txt");
- int retCode = LDAPSearch.mainSearch(jks_test_search_args);
- ds_output.resetOutput();
- int expCode = 0;
-
- compareExitCode(retCode, expCode);
- }
-
-}
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/connhandler.out b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/connhandler.out
deleted file mode 100644
index 9704548..0000000
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/connhandler.out
+++ /dev/null
@@ -1,23 +0,0 @@
-dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
-objectClass: top
-objectClass: ds-cfg-connection-handler
-objectClass: ds-cfg-ldap-connection-handler
-ds-cfg-allow-start-tls: false
-ds-cfg-use-tcp-keepalive: true
-ds-cfg-listen-address: 0.0.0.0
-ds-cfg-keep-stats: true
-ds-cfg-allow-tcp-reuse-address: true
-ds-cfg-ssl-cert-nickname: server-cert
-ds-cfg-use-tcp-nodelay: true
-ds-cfg-listen-port: 636
-ds-cfg-connection-handler-enabled: true
-ds-cfg-max-request-size: 5 MB
-ds-cfg-num-request-handlers: 2
-ds-cfg-allow-ldapv2: true
-ds-cfg-connection-handler-class: org.opends.server.protocols.ldap.LDAPConnectionHandler
-ds-cfg-send-rejection-notice: true
-cn: LDAPS Connection Handler
-ds-cfg-use-ssl: true
-ds-cfg-ssl-client-auth-policy: optional
-
-
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in.ldif
index 644c929..38c931b 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in_2nd.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in_2nd.ldif
index e8a224e..6001d66 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in_2nd.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_in_2nd.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in.ldif
index 601936e..427d5f6 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=jwallace, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in_2nd.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in_2nd.ldif
index fa130d2..048dc73 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in_2nd.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/add/bin_a1_tls_in_2nd.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bhall, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modify
add: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out.ldif
index 3d227d8..a3029dc 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out.ldif
@@ -1,2 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=bparker, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: delete
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out_2nd.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out_2nd.ldif
index 3f79bb2..5f61728 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out_2nd.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_out_2nd.ldif
@@ -1,2 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=rhunt, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: delete
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out.ldif
index da4d3eb..14fece8 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out.ldif
@@ -1,2 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: delete
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out_2nd.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out_2nd.ldif
index 31cef1a..03de583 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out_2nd.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/del/bin_a1_tls_out_2nd.ldif
@@ -1,2 +1,27 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: delete
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/jks_startup.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/jks_startup.ldif
index fc76448..522636a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/jks_startup.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/jks_startup.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: o=SSL Tests, dc=example,dc=com
o: SSL Tests
objectclass: top
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod.ldif
index 35de02d..d1e3912 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=scarter, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod_2nd.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod_2nd.ldif
index 449b64f..68e5696 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod_2nd.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_mod_2nd.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=tmorris, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod.ldif
index a501b35..ccc58fa 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=alutz, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod_2nd.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod_2nd.ldif
index 423e0da..e6f0dca 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod_2nd.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/mod/bin_a1_tls_mod_2nd.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: uid=mward, ou=People, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modify
replace: jpegPhoto
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn.ldif
index 5064e8c..0b1a819 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn:uid=prose, ou=people, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modrdn
newrdn: uid=thisisaminoradjustment
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn_2nd.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn_2nd.ldif
index 88b0581..176ea41 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn_2nd.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/modrdn/a1_modrdn_2nd.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn:uid=drose, ou=people, ou=jks tests, o=SSL Tests, dc=example,dc=com
changetype: modrdn
newrdn: uid=thisthesecondminoradjustment
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/shutdown/disable_TLS.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/shutdown/disable_TLS.ldif
index ffe268f..49f7a5d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/shutdown/disable_TLS.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/shutdown/disable_TLS.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config
changetype: modify
replace: ds-cfg-allow-start-tls
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/deleteTrustMgr.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/deleteTrustMgr.ldif
index 80d0412..19e21ab 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/deleteTrustMgr.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/deleteTrustMgr.ldif
@@ -1 +1,26 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
cn=Trust Manager Provider,cn=SSL,cn=config
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_TLS.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_TLS.ldif
index a1d0d11..cc38888 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_TLS.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_TLS.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config
changetype: modify
replace: ds-cfg-allow-start-tls
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_key_mgr_provider.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_key_mgr_provider.ldif
index c9b7812..69eb78e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_key_mgr_provider.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_key_mgr_provider.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Key Manager Provider,cn=SSL,cn=config
changetype: modify
replace: ds-cfg-key-manager-provider-enabled
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_ldaps_conn_handler.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_ldaps_conn_handler.ldif
index b7fa2fa..ee85f51 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_ldaps_conn_handler.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_ldaps_conn_handler.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config
objectclass: top
objectclass: ds-cfg-connection-handler
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_trust_mgr_provider.ldif b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_trust_mgr_provider.ldif
index 028883f..65c043f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_trust_mgr_provider.ldif
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/data/startup/enable_trust_mgr_provider.ldif
@@ -1,3 +1,28 @@
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# by brackets "[]" replaced with your own identifying * information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+#
+
dn: cn=Trust Manager Provider,cn=SSL,cn=config
objectClass: top
objectclass: ds-cfg-trust-manager-provider
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/handler.out b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/handler.out
deleted file mode 100644
index 5341648..0000000
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/handler.out
+++ /dev/null
@@ -1,24 +0,0 @@
-dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config
-objectClass: top
-objectClass: ds-cfg-connection-handler
-objectClass: ds-cfg-ldap-connection-handler
-ds-cfg-allow-start-tls: true
-ds-cfg-use-tcp-keepalive: true
-ds-cfg-listen-address: 0.0.0.0
-ds-cfg-keep-stats: true
-ds-cfg-ssl-cert-nickname: server-cert
-ds-cfg-allow-tcp-reuse-address: true
-ds-cfg-use-tcp-nodelay: true
-ds-cfg-listen-port: 389
-ds-cfg-connection-handler-enabled: true
-ds-cfg-accept-backlog: 128
-ds-cfg-max-request-size: 5 MB
-ds-cfg-num-request-handlers: 2
-ds-cfg-allow-ldapv2: true
-ds-cfg-connection-handler-class: org.opends.server.protocols.ldap.LDAPConnectionHandler
-ds-cfg-send-rejection-notice: true
-cn: LDAP Connection Handler
-ds-cfg-ssl-client-auth-policy: optional
-ds-cfg-use-ssl: false
-
-
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/keymgr.out b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/keymgr.out
deleted file mode 100644
index 4c653b9..0000000
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/keymgr.out
+++ /dev/null
@@ -1,12 +0,0 @@
-dn: cn=Key Manager Provider,cn=SSL,cn=config
-objectClass: top
-objectClass: ds-cfg-file-based-key-manager-provider
-objectClass: ds-cfg-key-manager-provider
-ds-cfg-key-manager-provider-class: org.opends.server.extensions.FileBasedKeyManagerProvider
-cn: Key Manager Provider
-ds-cfg-key-manager-provider-enabled: true
-ds-cfg-key-store-pin: servercert
-ds-cfg-key-store-file: config/keystore
-ds-cfg-key-store-type: JKS
-
-
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/trustmgr.out b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/trustmgr.out
deleted file mode 100644
index 69e8ce9..0000000
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/ssl/jks/trustmgr.out
+++ /dev/null
@@ -1,8 +0,0 @@
-dn: cn=Trust Manager Provider,cn=SSL,cn=config
-objectClass: top
-objectClass: ds-cfg-trust-manager-provider
-ds-cfg-trust-manager-provider-enabled: true
-ds-cfg-trust-manager-provider-class: org.opends.server.extensions.BlindTrustManagerProvider
-cn: Trust Manager Provider
-
-
--
Gitblit v1.10.0